Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mmu.h

diff --git a/arch/arm/mach-omap2/mmu.h b/arch/arm/mach-omap2/mmu.h
index 363eaa1e9cb6da8d00957a59169333a0b3947c9f..c9eabf0993fde5a6d1ae32c835b6c1b3f6b4606c 100644 (file)
--- a/arch/arm/mach-omap2/mmu.h
+++ b/arch/arm/mach-omap2/mmu.h
@@ -2,7 +2,7 @@
 #define __MACH_OMAP2_MMU_H
 
 #include <linux/io.h>
-#include <asm/arch/mmu.h>
+#include <mach/mmu.h>
 
 #define MMU_LOCK_BASE_MASK             (0x1f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x1f << 4)