diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-29 16:47:36 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-29 16:47:36 -0400 |
| commit | 58b6cf28da2fb962aca89bf82b196fa398521f40 (patch) | |
| tree | f00063ec26c4f1bf49c925cf30628b7c84f8b7a5 | |
| parent | f0c62b826ffab87e8035bed96ef56bf12079b8cd (diff) | |
fix missing merge resolution
A merge conflict resolution was hidden in mainline commit 2f284c8463.
Let's pick it up to fix build breakage for exynos4_defconfig.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/mach-exynos4/localtimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/localtimer.c b/arch/arm/mach-exynos4/localtimer.c index 2a2993ae8d8..6bf3d0ab962 100644 --- a/arch/arm/mach-exynos4/localtimer.c +++ b/arch/arm/mach-exynos4/localtimer.c @@ -18,8 +18,9 @@ /* * 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) { evt->irq = IRQ_LOCALTIMER; twd_timer_setup(evt); + return 0; } |