Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / include / asm / pgtable.h

diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 53f7acb1719166cac75f710cb9e942b5883a0ac3..acfac1a24bc0fefd1f0e0c4ac55d16624d5b7423 100644 (file)
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -20,7 +20,7 @@
 #else
 
 #include <asm/memory.h>
-#include <asm/arch/vmalloc.h>
+#include <mach/vmalloc.h>
 #include <asm/pgtable-hwdef.h>
 
 /*