Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / memory.h

diff --git a/include/asm-arm/arch-omap/memory.h b/arch/arm/plat-omap/include/mach/memory.h
similarity index 98%
rename from include/asm-arm/arch-omap/memory.h
rename to arch/arm/plat-omap/include/mach/memory.h
index d22c13d027cabb1c3289be67ea109f779113902d..eaf6bf92d000aec3122d794a46658f56d0c57e95 100644 (file)
--- a/include/asm-arm/arch-omap/memory.h
+++ b/arch/arm/plat-omap/include/mach/memory.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/memory.h
+ * arch/arm/plat-omap/include/mach/memory.h
  *
  * Memory map for OMAP-1510 and 1610
  *