From 9738e3bee595a49f99459153f56fcc858fcfa4cd Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Wed, 24 Aug 2011 16:07:39 +0900 Subject: [PATCH] --- yaml --- r: 264007 b: refs/heads/master c: 4d487d7ed46b9172664073dde324f55f9ab50f18 h: refs/heads/master i: 264005: b51c1729385d7957eddc3f20df9417033d639c16 264003: c5e5a4b2faee781f5c83b7a2c970ee1f07a87deb 263999: 60822bf0ae8427a9f756548a0c8289b4bbee89a3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos4/mct.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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)