From 3d05b2e98aa59135f5aa2c6e3cb0dbf9464105aa Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Sep 2011 17:50:03 -0700
Subject: [PATCH] --- yaml --- r: 272639 b: refs/heads/master c:
 b28fba2a4e631de99b25a9d4b2d1ba1c65f86f53 h: refs/heads/master i:   272637:
 9c5195ca9f2358408172ed312ea55d5dc59205bb   272635:
 8b899a5e3b3b615f4c5b8720aff8802a9d75c126   272631:
 7c43c755c43cf5f39fe7867c728ad88d624d2165   272623:
 23c2eb0805cd33693ea9e40e98d8ef0f193c2d61   272607:
 e9dafa5e53fdefdbcdc1f2f8c68142d9236885e9   272575:
 a218cd3b202a84045eacc6a5d4590222b8cda440   272511:
 329fbac16f7bed4f85a2625b0c4a5a0a92af39d2   272383:
 b59ddc0bf7a22a5ecab80c0086a3902da70a1d43 v: v3

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

diff --git a/[refs] b/[refs]
index 28f16fc843c3..e75fc13d7e15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74ae6c3cc5e58df6ff54e7d9971341ba96efaf41
+refs/heads/master: b28fba2a4e631de99b25a9d4b2d1ba1c65f86f53
diff --git a/trunk/arch/arm/mach-tegra/timer.c b/trunk/arch/arm/mach-tegra/timer.c
index 4d6759a02498..e2272d263a83 100644
--- a/trunk/arch/arm/mach-tegra/timer.c
+++ b/trunk/arch/arm/mach-tegra/timer.c
@@ -133,7 +133,7 @@ static void notrace tegra_update_sched_clock(void)
  * tegra_rtc driver could be executing to avoid race conditions
  * on the RTC shadow register
  */
-u64 tegra_rtc_read_ms(void)
+static u64 tegra_rtc_read_ms(void)
 {
 	u32 ms = readl(rtc_base + RTC_MILLISECONDS);
 	u32 s = readl(rtc_base + RTC_SHADOW_SECONDS);