From ce8927cc1acf06678baa51a9eb54970ba1471f35 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 6 Mar 2012 17:36:14 +0900
Subject: [PATCH] --- yaml --- r: 295793 b: refs/heads/master c:
 08ad42fb7702ee2968b5b837e245ca8fd2175223 h: refs/heads/master i:   295791:
 b1fba6e05ee8f646d8977d996b4436656bee4d14 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-shmobile/include/mach/common.h | 1 +
 trunk/arch/arm/mach-shmobile/timer.c               | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef81163e595e..be3206034275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b0161b3c846e7ce994bb5d1671e1ed5c871915
+refs/heads/master: 08ad42fb7702ee2968b5b837e245ca8fd2175223
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/common.h b/trunk/arch/arm/mach-shmobile/include/mach/common.h
index f005ac0e4621..e41b61a48439 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/common.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/common.h
@@ -1,6 +1,7 @@
 #ifndef __ARCH_MACH_COMMON_H
 #define __ARCH_MACH_COMMON_H
 
+extern void shmobile_earlytimer_init(void);
 extern struct sys_timer shmobile_timer;
 extern void shmobile_setup_console(void);
 extern void shmobile_secondary_vector(void);
diff --git a/trunk/arch/arm/mach-shmobile/timer.c b/trunk/arch/arm/mach-shmobile/timer.c
index 895794b543cd..e51064343553 100644
--- a/trunk/arch/arm/mach-shmobile/timer.c
+++ b/trunk/arch/arm/mach-shmobile/timer.c
@@ -36,11 +36,16 @@ static void __init shmobile_late_time_init(void)
 	early_platform_driver_probe("earlytimer", 2, 0);
 }
 
-static void __init shmobile_timer_init(void)
+void __init shmobile_earlytimer_init(void)
 {
 	late_time_init = shmobile_late_time_init;
 }
 
+static void __init shmobile_timer_init(void)
+{
+	shmobile_earlytimer_init();
+}
+
 struct sys_timer shmobile_timer = {
 	.init		= shmobile_timer_init,
 };