Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / omap2.c

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index b4ce8085f27fee987bfa927e4224402fea53aebb..a33944c9d5fa0a36715f2ef582de47a6650c3ae3 100644 (file)
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -20,8 +20,8 @@
 
 #include <asm/dma.h>
 
-#include <asm/arch/gpmc.h>
-#include <asm/arch/nand.h>
+#include <mach/gpmc.h>
+#include <mach/nand.h>
 
 #define GPMC_IRQ_STATUS                0x18
 #define GPMC_ECC_CONFIG                0x1F4