Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / misc / ioc4.c

diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 1c3c14a..79354bb 100644 (file)
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -32,6 +32,7 @@
 #include <linux/ktime.h>
 #include <linux/mutex.h>
 #include <linux/time.h>
+#include <asm/io.h>
 
 /***************
  * Definitions *