diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-15 23:29:12 -0400 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/joystick/adi.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/adi.c')
| -rw-r--r-- | drivers/input/joystick/adi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c index d1ca8a14950f..89c4c084d4ad 100644 --- a/drivers/input/joystick/adi.c +++ b/drivers/input/joystick/adi.c | |||
| @@ -572,8 +572,7 @@ static struct gameport_driver adi_drv = { | |||
| 572 | 572 | ||
| 573 | static int __init adi_init(void) | 573 | static int __init adi_init(void) |
| 574 | { | 574 | { |
| 575 | gameport_register_driver(&adi_drv); | 575 | return gameport_register_driver(&adi_drv); |
| 576 | return 0; | ||
| 577 | } | 576 | } |
| 578 | 577 | ||
| 579 | static void __exit adi_exit(void) | 578 | static void __exit adi_exit(void) |