Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/board-n800-flash.c b/arch/arm/mach-omap2/board-n800-flash.c
index fbf83b3b0eba5e02a67bc9f5f8059613e48df3d6..52aaf76417e36f48a1890f8995debd53b5ca8202 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-flash.c
+++ b/arch/arm/mach-omap2/board-n800-flash.c
@@ -15,9 +15,9 @@
 #include <linux/mtd/onenand_regs.h>
 
 #include <asm/io.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpmc.h>
+#include <mach/onenand.h>
+#include <mach/board.h>
+#include <mach/gpmc.h>
 
 struct mtd_partition n800_partitions[ONENAND_MAX_PARTITIONS];