Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h
index 9d9d9bc9dc683c0efcbc119517c7e8b52e47ff5f..b0255af2b1d38d161a0603ff660a02e261ffb9b6 100644 (file)
--- a/arch/arm/mach-omap1/mmu.h
+++ b/arch/arm/mach-omap1/mmu.h
@@ -2,7 +2,7 @@
 #define __MACH_OMAP1_MMU_H
 
 #include <linux/io.h>
-#include <asm/arch/mmu.h>
+#include <mach/mmu.h>
 
 #define MMU_LOCK_BASE_MASK             (0x3f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x3f << 4)