From fc18d475b2315a0d26382634841aa1d0d50e53c3 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 4 Sep 2012 13:17:33 -0700
Subject: [PATCH] --- yaml --- r: 326465 b: refs/heads/master c:
 3b5909deb3ed276727d248a5289954a142b2c686 h: refs/heads/master i:   326463:
 34bdfee648abe581f3fc7ca464a9237c3794b11d v: v3

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

diff --git a/[refs] b/[refs]
index e4f4bf14add2..883c8ade3998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b07609cf88e51043d81809845384f96cffb3ab3e
+refs/heads/master: 3b5909deb3ed276727d248a5289954a142b2c686
diff --git a/trunk/arch/arm/mach-msm/timer.c b/trunk/arch/arm/mach-msm/timer.c
index 812808254936..004f93515a4e 100644
--- a/trunk/arch/arm/mach-msm/timer.c
+++ b/trunk/arch/arm/mach-msm/timer.c
@@ -101,7 +101,7 @@ static struct clock_event_device msm_clockevent = {
 
 static union {
 	struct clock_event_device *evt;
-	struct clock_event_device __percpu **percpu_evt;
+	struct clock_event_device * __percpu *percpu_evt;
 } msm_evt;
 
 static void __iomem *source_base;