Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / gf2k.c

diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 1f6302c0eb3fd8e47c5f8e5a5edfdd95836d5fe8..67c207f5b1a16cd56e88b140c63bbfdefb8f498b 100644 (file)
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -1,6 +1,4 @@
 /*
- * $Id: gf2k.c,v 1.19 2002/01/22 20:27:43 vojtech Exp $
- *
  *  Copyright (c) 1998-2001 Vojtech Pavlik
  */
 
@@ -377,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)