Merge branch 'work'

[linux-2.6-omap-h63xx.git] / include / linux / gameport.h

diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index cd623eccdbea61c8e8b8eba1f931645b95c01115..2401dea2b867c798808f0433f575db7e0888f9b6 100644 (file)
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -12,6 +12,7 @@
 #include <asm/io.h>
 #include <linux/list.h>
 #include <linux/device.h>
+#include <linux/timer.h>
 
 struct gameport {