Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
"A clocksource driver section mismatch fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/integrator: Fix section mismatch warning

Changed files
+2 -2
drivers
clocksource
+2 -2
drivers/clocksource/timer-integrator-ap.c
··· 36 36 return -readl(sched_clk_base + TIMER_VALUE); 37 37 } 38 38 39 - static int integrator_clocksource_init(unsigned long inrate, 40 - void __iomem *base) 39 + static int __init integrator_clocksource_init(unsigned long inrate, 40 + void __iomem *base) 41 41 { 42 42 u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC; 43 43 unsigned long rate = inrate;