Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-omap3evm-flash.c

diff --git a/arch/arm/mach-omap2/board-omap3evm-flash.c b/arch/arm/mach-omap2/board-omap3evm-flash.c
index 109d8f22abdb241e327cef6185784f1cd4bf34f7..0aa8ef26879b8c56afcafe3ca1571afe45db8d14 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm-flash.c
+++ b/arch/arm/mach-omap2/board-omap3evm-flash.c
@@ -18,10 +18,10 @@
 #include <linux/io.h>
 
 #include <asm/mach/flash.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/nand.h>
+#include <mach/onenand.h>
+#include <mach/board.h>
+#include <mach/gpmc.h>
+#include <mach/nand.h>
 
 static int omap3evm_onenand_setup(void __iomem *);