From 00cc5b48fa0a2164ef73138f9e731eb26fb411f5 Mon Sep 17 00:00:00 2001
From: Jeff Ohlstein <johlstei@codeaurora.org>
Date: Thu, 21 Oct 2010 02:25:45 -0700
Subject: [PATCH] --- yaml --- r: 221004 b: refs/heads/master c:
 6f9419619ef6de9d7781c1a312cf6099e5b44789 h: refs/heads/master 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 18769e1488e3..cff18fe29668 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a86c44d48a03dcd73972ddadb55a77e6b308fa0b
+refs/heads/master: 6f9419619ef6de9d7781c1a312cf6099e5b44789
diff --git a/trunk/arch/arm/mach-msm/timer.c b/trunk/arch/arm/mach-msm/timer.c
index 7689848ec680..950100f19d07 100644
--- a/trunk/arch/arm/mach-msm/timer.c
+++ b/trunk/arch/arm/mach-msm/timer.c
@@ -137,7 +137,7 @@ static struct msm_clock msm_clocks[] = {
 			.rating         = 200,
 			.read           = msm_gpt_read,
 			.mask           = CLOCKSOURCE_MASK(32),
-			.shift          = 24,
+			.shift          = 17,
 			.flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 		},
 		.irq = {