aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index c105d28b53e3..ae85aa951806 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -255,7 +255,7 @@ static void __init msm_timer_init(void)
255} 255}
256 256
257#ifdef CONFIG_SMP 257#ifdef CONFIG_SMP
258void __cpuinit local_timer_setup(struct clock_event_device *evt) 258int __cpuinit local_timer_setup(struct clock_event_device *evt)
259{ 259{
260 struct msm_clock *clock = &msm_clocks[MSM_GLOBAL_TIMER]; 260 struct msm_clock *clock = &msm_clocks[MSM_GLOBAL_TIMER];
261 261
@@ -287,6 +287,7 @@ void __cpuinit local_timer_setup(struct clock_event_device *evt)
287 gic_enable_ppi(clock->irq.irq); 287 gic_enable_ppi(clock->irq.irq);
288 288
289 clockevents_register_device(evt); 289 clockevents_register_device(evt);
290 return 0;
290} 291}
291 292
292inline int local_timer_ack(void) 293inline int local_timer_ack(void)