Merge branch 'upstream'

[powerpc.git] / drivers / input / joystick / grip_mp.c

diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index a0ba93c..6243894 100644 (file)
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 
 #define DRIVER_DESC    "Gravis Grip Multiport driver"
 
@@ -52,17 +53,8 @@ struct grip_port {
 struct grip_mp {
        struct gameport *gameport;
        struct grip_port *port[GRIP_MAX_PORTS];
-//     struct input_dev *dev[4];
-//     int mode[4];
-//     int registered[4];
        int reads;
        int bads;
-
-       /* individual gamepad states */
-//     int buttons[4];
-//     int xaxes[4];
-//     int yaxes[4];
-//     int dirty[4];     /* has the state been updated? */
 };
 
 /*