---

yaml --- r: 270199 b: refs/heads/master c: 9d25544 h: refs/heads/master i: 270197: b95bd4c 270195: 530f800 270191: 78cbd46 v: v3
git-mirror · Oct 13, 2011 · 7c1b0db · 7c1b0db
1 parent 799ce35
commit 7c1b0db
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8c9e024e300cc3dfccf96050368880ef1669426
+refs/heads/master: 9d25544968f831e97e858bd8ec2933f225126ca8
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -660,6 +660,7 @@ config ARCH_MSM
 	select GENERIC_CLOCKEVENTS
 	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Qualcomm MSM/QSD based systems.  This runs on the
 	  apps processor of the MSM/QSD and depends on a shared memory

diff --git a/trunk/arch/arm/mach-msm/include/mach/memory.h b/trunk/arch/arm/mach-msm/include/mach/memory.h