summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/a3d.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 03:37:12 +0100
committerPaul Mackerras <paulus@samba.org>2005-10-31 03:37:12 +0100
commit23fd07750a789a66fe88cf173d52a18f1a387da4 (patch)
tree06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/input/joystick/a3d.c
parentppc: remove duplicate export of cur_cpu_spec (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz
linux-23fd07750a789a66fe88cf173d52a18f1a387da4.zip
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/input/joystick/a3d.c')
-rw-r--r--drivers/input/joystick/a3d.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index bf65430181fa..4571ea3a4b92 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -34,6 +34,7 @@
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/input.h>
+#include <linux/jiffies.h>
#define DRIVER_DESC "FP-Gaming Assasin 3D joystick driver"