Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

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

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 27fc475bd3a19166eb42bcef23d09a0faa24b6f9..960e501c60c8627315721118439a1b878a0694ab 100644 (file)
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 1999-2001 Vojtech Pavlik
  *
  *  Based on the work of:
- *     Andree Borrmann         Mats Sjövall
+ *     Andree Borrmann         Mats Sjövall
  */
 
 /*
@@ -33,7 +33,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/parport.h>