From 4a89fe2295f3f0829559a05a6ca97fc0608cd5bf Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 19 Sep 2011 10:54:04 -0700
Subject: [PATCH] --- yaml --- r: 281535 b: refs/heads/master c:
 2b222a2971e4d73fc25c09aeb203c16c0c3c142e h: refs/heads/master i:   281533:
 22aa867420ad3e59cbab42ba753b281893433610   281531:
 bacaa980959ef81509b4b6cf14139f9541a2aa1c   281527:
 72c2459a903920a4e51cd4e6c0ce65728a1c1b4b   281519:
 849a7463cae647f5c7132233087dd17a82f79236   281503:
 0ee408bc740fb8dc7ffc1aac74a8d42423f2b246   281471:
 65524a515855477c7066cc42d7669847c50c9f49 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-msm/platsmp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0c357b7bf48..803b23ceb2f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3d3ef9d4fd57cfd407c8d2d0a7daec000468ebf
+refs/heads/master: 2b222a2971e4d73fc25c09aeb203c16c0c3c142e
diff --git a/trunk/arch/arm/mach-msm/platsmp.c b/trunk/arch/arm/mach-msm/platsmp.c
index fdec58aaa35c..0b3e357c4c8c 100644
--- a/trunk/arch/arm/mach-msm/platsmp.c
+++ b/trunk/arch/arm/mach-msm/platsmp.c
@@ -79,7 +79,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)
 	ret = scm_set_boot_addr(virt_to_phys(msm_secondary_startup),
 				SCM_FLAG_COLDBOOT_CPU1);
 	if (ret == 0) {
-		void *sc1_base_ptr;
+		void __iomem *sc1_base_ptr;
 		sc1_base_ptr = ioremap_nocache(0x00902000, SZ_4K*2);
 		if (sc1_base_ptr) {
 			writel(0, sc1_base_ptr + VDD_SC1_ARRAY_CLAMP_GFS_CTL);