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/guillemot.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | b8d055a878ee0f997ded40649701089d2486f850 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/guillemot.c')
| -rw-r--r-- | drivers/input/joystick/guillemot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c index 25ec3fad9f27..4058d4b272fe 100644 --- a/drivers/input/joystick/guillemot.c +++ b/drivers/input/joystick/guillemot.c | |||
| @@ -283,8 +283,7 @@ static struct gameport_driver guillemot_drv = { | |||
| 283 | 283 | ||
| 284 | static int __init guillemot_init(void) | 284 | static int __init guillemot_init(void) |
| 285 | { | 285 | { |
| 286 | gameport_register_driver(&guillemot_drv); | 286 | return gameport_register_driver(&guillemot_drv); |
| 287 | return 0; | ||
| 288 | } | 287 | } |
| 289 | 288 | ||
| 290 | static void __exit guillemot_exit(void) | 289 | static void __exit guillemot_exit(void) |