Merge branch 'linus' into oprofile

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ep93xx / edb9307.c

diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c
index 7dee28e9d7f9d31e7e9b361fc920eda11d664733..040edbd2ea053d92437e42129bcea91b9b684123 100644 (file)
--- a/arch/arm/mach-ep93xx/edb9307.c
+++ b/arch/arm/mach-ep93xx/edb9307.c
@@ -18,7 +18,7 @@
 #include <linux/ioport.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>