Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / drivers / input / serio / q40kbd.c

diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index ab28cf5949f24b61fa15c3175ea201266f9b3023..e36a0901646cb2d2d91be060771946af9d60f75b 100644 (file)
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -154,7 +154,7 @@ static int __init q40kbd_init(void)
        int error;
 
        if (!MACH_IS_Q40)
-               return -EIO;
+               return -ENODEV;
 
        error = platform_driver_register(&q40kbd_driver);
        if (error)