Merge branch 'pxa-all' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / common / locomo.c

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 8f473b7c34947c1587cb3486f53e99409a00d9ec..7c6b4b99a2df1c98027a6adaee4a87dbe6371554 100644 (file)
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -24,9 +24,9 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>