Merge branch 'x86/urgent' into core/signal

[linux-2.6-omap-h63xx.git] / arch / arm / mach-clps711x / irq.c

diff --git a/arch/arm/mach-clps711x/irq.c b/arch/arm/mach-clps711x/irq.c
index ca102960f5284dac84b11ca48012061dc10e1b3b..9a12d8562284968a7ffe2b33a40806ce4a4f2a2b 100644 (file)
--- a/arch/arm/mach-clps711x/irq.c
+++ b/arch/arm/mach-clps711x/irq.c
@@ -19,10 +19,10 @@
  */
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/io.h>
 
 #include <asm/mach/irq.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/hardware/clps7111.h>