summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/amikbd.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-20 07:53:13 (GMT)
committerLen Brown <len.brown@intel.com>2006-12-20 07:53:13 (GMT)
commit9774f3384125912eb491ca77f77907324db3ed05 (patch)
tree0bdc7486e911dd9e955b41283ee19ac74521f7bd /drivers/input/keyboard/amikbd.c
parent3be11c8f4f2fa194834c2e83540f34da442b8977 (diff)
parentf238085415c56618e042252894f2fcc971add645 (diff)
downloadlinux-9774f3384125912eb491ca77f77907324db3ed05.tar.xz
merge linus into test branch
Diffstat (limited to 'drivers/input/keyboard/amikbd.c')
-rw-r--r--drivers/input/keyboard/amikbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index 16583d7..c67e84e 100644
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -187,7 +187,7 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy)
static int __init amikbd_init(void)
{
- int i, j;
+ int i, j, err;
if (!AMIGAHW_PRESENT(AMI_KEYBOARD))
return -ENODEV;