Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / amikbd.c

diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index 16583d71753b9ec8faca41a4e2eb5584105719cd..c67e84ec2d6a506b94696c1739dd9d9a76752181 100644 (file)
--- 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;