diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 13:59:05 +0100 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /drivers/clocksource/arm_global_timer.c | |
| parent | a1216394e620d0dfbb03c712ae3210e7b77c9e11 (diff) | |
| parent | 8d4d08ce8319ae26227c4dd558405963c14c2037 (diff) | |
| download | talos-op-linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.gz talos-op-linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/clocksource/arm_global_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_global_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c index db8afc7427a6..b66c1f36066c 100644 --- a/drivers/clocksource/arm_global_timer.c +++ b/drivers/clocksource/arm_global_timer.c @@ -164,7 +164,7 @@ static irqreturn_t gt_clockevent_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int __cpuinit gt_clockevents_init(struct clock_event_device *clk) +static int gt_clockevents_init(struct clock_event_device *clk) { int cpu = smp_processor_id(); @@ -221,8 +221,8 @@ static void __init gt_clocksource_init(void) clocksource_register_hz(>_clocksource, gt_clk_rate); } -static int __cpuinit gt_cpu_notify(struct notifier_block *self, - unsigned long action, void *hcpu) +static int gt_cpu_notify(struct notifier_block *self, unsigned long action, + void *hcpu) { switch (action & ~CPU_TASKS_FROZEN) { case CPU_STARTING: @@ -235,7 +235,7 @@ static int __cpuinit gt_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } -static struct notifier_block gt_cpu_nb __cpuinitdata = { +static struct notifier_block gt_cpu_nb = { .notifier_call = gt_cpu_notify, }; |
