From d687204ecfc81c4e95b6eaf6ab4caf973e26b250 Mon Sep 17 00:00:00 2001
From: Jeff Ohlstein <johlstei@codeaurora.org>
Date: Thu, 6 May 2010 14:18:06 -0700
Subject: [PATCH] --- yaml --- r: 212619 b: refs/heads/master c:
 998ba079fee7d9639003d77521d2117db17b4a04 h: refs/heads/master i:   212617:
 5b1089e86d376f7c8174f9b8a59669bfd6491eaa   212615:
 d8afd6c58126bd0e606e673ecf54aaa35b292347 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-msm/include/mach/memory.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dabd06dcb69c..7ac95337db03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4fbb68f4594388367e4e4595abf9330d9875704
+refs/heads/master: 998ba079fee7d9639003d77521d2117db17b4a04
diff --git a/trunk/arch/arm/mach-msm/include/mach/memory.h b/trunk/arch/arm/mach-msm/include/mach/memory.h
index 50c7847e6002..070e17d237f1 100644
--- a/trunk/arch/arm/mach-msm/include/mach/memory.h
+++ b/trunk/arch/arm/mach-msm/include/mach/memory.h
@@ -23,6 +23,8 @@
 #define PHYS_OFFSET		UL(0x20000000)
 #elif defined(CONFIG_ARCH_MSM7X30)
 #define PHYS_OFFSET		UL(0x00200000)
+#elif defined(CONFIG_ARCH_MSM8X60)
+#define PHYS_OFFSET		UL(0x40200000)
 #else
 #define PHYS_OFFSET		UL(0x10000000)
 #endif