Merge branch 'pxa-all' into devel

[pandora-kernel.git] / arch / arm / mach-netx / generic.c

diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 3830eca..79df60c 100644 (file)
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -22,10 +22,10 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/vic.h>
-#include <asm/io.h>
 #include <mach/netx-regs.h>
 #include <asm/mach/irq.h>