Merge branch 'driver-core-next' into Linux 3.2

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-bcmring / core.c

diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 31d84ae44c4cf3a4cc82f9352c838679adc41d88..6b67b7e8426ce8d313b84b910237b9848f5b7c23 100644 (file)
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -234,7 +234,7 @@ void __init bcmring_init_timer(void)
         */
        bcmring_clocksource_init();
 
-       sp804_clockevents_register(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
+       sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
 }
 
 struct sys_timer bcmring_timer = {