From acd0ca7313e334cfe3ca5bf9e9ccf29a2be098f0 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@codeaurora.org>
Date: Thu, 6 May 2010 14:18:06 -0700
Subject: [PATCH] --- yaml --- r: 192202 b: refs/heads/master c:
 41f04b17b6409026fda01942628496ec7dca2f06 h: refs/heads/master 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 c00e06bd6e8b..5783ee689b4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c83b2bf66a40cd9bb3af3f6e28d36babb6748d73
+refs/heads/master: 41f04b17b6409026fda01942628496ec7dca2f06
diff --git a/trunk/arch/arm/mach-msm/include/mach/memory.h b/trunk/arch/arm/mach-msm/include/mach/memory.h
index cfee996a47d5..50c7847e6002 100644
--- a/trunk/arch/arm/mach-msm/include/mach/memory.h
+++ b/trunk/arch/arm/mach-msm/include/mach/memory.h
@@ -21,6 +21,8 @@
 #define PHYS_OFFSET		UL(0x00000000)
 #elif defined(CONFIG_ARCH_QSD8X50)
 #define PHYS_OFFSET		UL(0x20000000)
+#elif defined(CONFIG_ARCH_MSM7X30)
+#define PHYS_OFFSET		UL(0x00200000)
 #else
 #define PHYS_OFFSET		UL(0x10000000)
 #endif