diff --git a/[refs] b/[refs]
index f25707101b87..8fb8f14952f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6861a197e2ed6dd05c0316ee2006730fbb6e7f9a
+refs/heads/master: 4d487d7ed46b9172664073dde324f55f9ab50f18
diff --git a/trunk/arch/arm/mach-exynos4/mct.c b/trunk/arch/arm/mach-exynos4/mct.c
index 1ae059b7ad7b..f3638fa73e62 100644
--- a/trunk/arch/arm/mach-exynos4/mct.c
+++ b/trunk/arch/arm/mach-exynos4/mct.c
@@ -389,9 +389,11 @@ static void exynos4_mct_tick_init(struct clock_event_device *evt)
 }
 
 /* Setup the local clock events for a CPU */
-void __cpuinit local_timer_setup(struct clock_event_device *evt)
+int __cpuinit local_timer_setup(struct clock_event_device *evt)
 {
 	exynos4_mct_tick_init(evt);
+
+	return 0;
 }
 
 int local_timer_ack(void)