Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/mmu.c b/arch/arm/mach-omap2/mmu.c
index 11718ce5afbc4765cc52c5adea8730de3e1df9c9..6fc3303af515adaee06797612611c02778e6c221 100644 (file)
--- a/arch/arm/mach-omap2/mmu.c
+++ b/arch/arm/mach-omap2/mmu.c
@@ -23,7 +23,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include "mmu.h"
-#include <asm/arch/mmu.h>
+#include <mach/mmu.h>
 #include <asm/tlbflush.h>
 #include <asm/sizes.h>