From 0df48d8bc28c81256b2fe57b7b442216143575b7 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Nov 2012 23:05:32 -0800
Subject: [PATCH] --- yaml --- r: 339945 b: refs/heads/master c:
 73f14f6d007df1596da7cea9113084acfe846b8f h: refs/heads/master i:   339943:
 d40247805c14953ffa0f3883492898f074b57114 v: v3

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

diff --git a/[refs] b/[refs]
index 2032f441e6e8..707c1a86f2e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a1ceccf394b2f99feed2b702732140e9f0f92d
+refs/heads/master: 73f14f6d007df1596da7cea9113084acfe846b8f
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index b9cff72ceaec..7016637b531c 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void)
 	}
 }
 #else /* CONFIG_LOCAL_TIMERS */
-static inline void omap4_local_timer_init(void)
+static void __init omap4_local_timer_init(void)
 {
-	omap4_sync32_timer_init();
+	omap4_sync32k_timer_init();
 }
 #endif /* CONFIG_LOCAL_TIMERS */
 OMAP_SYS_TIMER(4, local);