diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
| commit | 0f1f6dec9593c8319714c927dafb443548a1452a (patch) | |
| tree | 74f887dc86747523e82f08900501073f451996cc /drivers/input/joystick/guillemot.c | |
| parent | sched: only update rq->clock while holding rq->lock (diff) | |
| parent | {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() (diff) | |
| download | linux-0f1f6dec9593c8319714c927dafb443548a1452a.tar.xz linux-0f1f6dec9593c8319714c927dafb443548a1452a.zip | |
Merge branch 'linus' into sched/urgent
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 = { static int __init guillemot_init(void) { - gameport_register_driver(&guillemot_drv); - return 0; + return gameport_register_driver(&guillemot_drv); } static void __exit guillemot_exit(void) |