diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/input/serio/q40kbd.c | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/input/serio/q40kbd.c')
| -rw-r--r-- | drivers/input/serio/q40kbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index ab28cf5949f2..e36a0901646c 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c | |||
| @@ -154,7 +154,7 @@ static int __init q40kbd_init(void) | |||
| 154 | int error; | 154 | int error; |
| 155 | 155 | ||
| 156 | if (!MACH_IS_Q40) | 156 | if (!MACH_IS_Q40) |
| 157 | return -EIO; | 157 | return -ENODEV; |
| 158 | 158 | ||
| 159 | error = platform_driver_register(&q40kbd_driver); | 159 | error = platform_driver_register(&q40kbd_driver); |
| 160 | if (error) | 160 | if (error) |