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 176875df241fb0f5bbcfae5e69cc1cee5930010f..f2f8d299ba9533a1d15ce080823e3a2f653a579b 100644 (file)
--- a/arch/arm/mach-msm/include/mach/memory.h
+++ b/arch/arm/mach-msm/include/mach/memory.h
@@ -25,6 +25,8 @@
 #define PLAT_PHYS_OFFSET               UL(0x00200000)
 #elif defined(CONFIG_ARCH_MSM8X60)
 #define PLAT_PHYS_OFFSET               UL(0x40200000)
+#elif defined(CONFIG_ARCH_MSM8960)
+#define PLAT_PHYS_OFFSET               UL(0x40200000)
 #else
 #define PLAT_PHYS_OFFSET               UL(0x10000000)
 #endif