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/a3d.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/a3d.c')
| -rw-r--r-- | drivers/input/joystick/a3d.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c index 92498d470b1f..6489f4010c4f 100644 --- a/drivers/input/joystick/a3d.c +++ b/drivers/input/joystick/a3d.c | |||
| @@ -414,8 +414,7 @@ static struct gameport_driver a3d_drv = { | |||
| 414 | 414 | ||
| 415 | static int __init a3d_init(void) | 415 | static int __init a3d_init(void) |
| 416 | { | 416 | { |
| 417 | gameport_register_driver(&a3d_drv); | 417 | return gameport_register_driver(&a3d_drv); |
| 418 | return 0; | ||
| 419 | } | 418 | } |
| 420 | 419 | ||
| 421 | static void __exit a3d_exit(void) | 420 | static void __exit a3d_exit(void) |