Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

[linux-2.6-omap-h63xx.git] / arch / arm / mach-davinci / board-evm.c

diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c
index 9581675f6586d6aa3d8a1d20f556ad2f2a8478f6..a957d239a6838f20458525a2710fa094073f674e 100644 (file)
--- a/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
@@ -23,9 +23,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/io.h>
 
 #include <asm/setup.h>
-#include <asm/io.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>