diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 10:09:03 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 10:09:03 (GMT) |
| commit | 64393c6e647c8a791243063d282c787b46721be7 (patch) | |
| tree | 89ca12bd5d52e8df24d2bc13a36d30479a4e825d /arch/arm/mach-msm/timer.c | |
| parent | a2388a498ad2f85be01aca29e364abf427d9b53c (diff) | |
| parent | 741a509f34d8d702f70d0ad99b8152c57d76961e (diff) | |
| download | linux-fsl-qoriq-64393c6e647c8a791243063d282c787b46721be7.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index b6418fd..8697cfc 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -139,7 +139,7 @@ static struct clocksource msm_clocksource = { }; #ifdef CONFIG_LOCAL_TIMERS -static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt) +static int msm_local_timer_setup(struct clock_event_device *evt) { /* Use existing clock_event for cpu 0 */ if (!smp_processor_id()) @@ -164,7 +164,7 @@ static void msm_local_timer_stop(struct clock_event_device *evt) disable_percpu_irq(evt->irq); } -static struct local_timer_ops msm_local_timer_ops __cpuinitdata = { +static struct local_timer_ops msm_local_timer_ops = { .setup = msm_local_timer_setup, .stop = msm_local_timer_stop, }; |