diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:52:04 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:52:04 +0200 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /drivers/input/joystick/gf2k.c | |
| parent | Merge commit 'kumar/kumar-for-2.6.28' (diff) | |
| parent | binfmt_elf_fdpic: Update for cputime changes. (diff) | |
| download | linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.xz linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'drivers/input/joystick/gf2k.c')
| -rw-r--r-- | drivers/input/joystick/gf2k.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c index cb6eef1f2d99..67c207f5b1a1 100644 --- a/drivers/input/joystick/gf2k.c +++ b/drivers/input/joystick/gf2k.c @@ -375,8 +375,7 @@ static struct gameport_driver gf2k_drv = { static int __init gf2k_init(void) { - gameport_register_driver(&gf2k_drv); - return 0; + return gameport_register_driver(&gf2k_drv); } static void __exit gf2k_exit(void) |