Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / mmu.c

diff --git a/arch/arm/plat-omap/mmu.c b/arch/arm/plat-omap/mmu.c
index 4b1ba8e99835a39342a1193d458dcb8bc6c346bc..d81a1488bd93621db45051d84e23225c250fba1e 100644 (file)
--- a/arch/arm/plat-omap/mmu.c
+++ b/arch/arm/plat-omap/mmu.c
@@ -26,9 +26,9 @@
 #include <linux/io.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
-#include <asm/arch/mmu.h>
+#include <mach/mmu.h>
 #include <asm/sizes.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/dsp_common.h>
 
 #if defined(CONFIG_ARCH_OMAP1)
 #include "../mach-omap1/mmu.h"