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/analog.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/analog.c')
| -rw-r--r-- | drivers/input/joystick/analog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 708c5ae13b24..356b3a25efa2 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c | |||
| @@ -761,9 +761,7 @@ static struct gameport_driver analog_drv = { | |||
| 761 | static int __init analog_init(void) | 761 | static int __init analog_init(void) |
| 762 | { | 762 | { |
| 763 | analog_parse_options(); | 763 | analog_parse_options(); |
| 764 | gameport_register_driver(&analog_drv); | 764 | return gameport_register_driver(&analog_drv); |
| 765 | |||
| 766 | return 0; | ||
| 767 | } | 765 | } |
| 768 | 766 | ||
| 769 | static void __exit analog_exit(void) | 767 | static void __exit analog_exit(void) |