Merge remote branch 'rmk/for-linus' into for-linus

[~andy/linux] / arch / arm / mach-msm / include / mach / memory.h

diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h
index 014bbd3ac1d4e75bede1294c34ed234e3373f327..f2f8d299ba9533a1d15ce080823e3a2f653a579b 100644 (file)
--- a/arch/arm/mach-msm/include/mach/memory.h
+++ b/arch/arm/mach-msm/include/mach/memory.h
@@ -18,17 +18,17 @@
 
 /* physical offset of RAM */
 #if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A)
-#define PHYS_OFFSET            UL(0x00000000)
+#define PLAT_PHYS_OFFSET               UL(0x00000000)
 #elif defined(CONFIG_ARCH_QSD8X50)
-#define PHYS_OFFSET            UL(0x20000000)
+#define PLAT_PHYS_OFFSET               UL(0x20000000)
 #elif defined(CONFIG_ARCH_MSM7X30)
-#define PHYS_OFFSET            UL(0x00200000)
+#define PLAT_PHYS_OFFSET               UL(0x00200000)
 #elif defined(CONFIG_ARCH_MSM8X60)
-#define PHYS_OFFSET            UL(0x40200000)
+#define PLAT_PHYS_OFFSET               UL(0x40200000)
 #elif defined(CONFIG_ARCH_MSM8960)
-#define PHYS_OFFSET            UL(0x40200000)
+#define PLAT_PHYS_OFFSET               UL(0x40200000)
 #else
-#define PHYS_OFFSET            UL(0x10000000)
+#define PLAT_PHYS_OFFSET               UL(0x10000000)
 #endif
 
 #endif