Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap1/mmu.c b/arch/arm/mach-omap1/mmu.c
index a894ca2da247b280f2ecec33dc31a49dab1c52b4..75dd310a9073921264659e6e8f34cac93718d661 100644 (file)
--- a/arch/arm/mach-omap1/mmu.c
+++ b/arch/arm/mach-omap1/mmu.c
@@ -22,7 +22,7 @@
 #include <linux/err.h>
 #include "mmu.h"
 #include <asm/tlbflush.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/dsp_common.h>
 
 static void *dspvect_page;
 #define DSP_INIT_PAGE  0xfff000