Merge branch 'linus' into core/locking

[linux-2.6-block.git] / drivers / input / joystick / interact.c

diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 88c22623a2e8cc01ec461d70f216f09486a25904..17c2c800743c8d230aebc0d60cdd8ad56de54e7a 100644 (file)
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
 #include <linux/jiffies.h>