Merge branch 'pxa-all' into devel

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

diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c
index 72159d31966e9e0c0c1a005d21c97c65c7605815..41720f2c1fea8eb3d1ccb52ac181a4540c76061d 100644 (file)
--- a/arch/arm/mach-s3c2412/irq.c
+++ b/arch/arm/mach-s3c2412/irq.c
@@ -24,10 +24,10 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 
 #include <asm/mach/irq.h>