From b616b3bc3c1f023d3f30698a3d10b8527365893f Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Wed, 9 Nov 2011 11:12:58 +0100 Subject: [PATCH] --- yaml --- r: 275635 b: refs/heads/master c: 8658ca730fa66fd6b8c559315915c774330f35bb h: refs/heads/master i: 275633: 300d43c24a5ccd974a927e737ebbd408ef5c04fe 275631: c1c82ea3bbb867c5d9055e83c1dade3c1a6ec109 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-bcmring/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 619f17016d0d..bb37644016d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f300acd8ae9f3d4585154370012ffc5c665330f +refs/heads/master: 8658ca730fa66fd6b8c559315915c774330f35bb diff --git a/trunk/arch/arm/mach-bcmring/core.c b/trunk/arch/arm/mach-bcmring/core.c index 43eadbcc29ed..430da120a297 100644 --- a/trunk/arch/arm/mach-bcmring/core.c +++ b/trunk/arch/arm/mach-bcmring/core.c @@ -235,7 +235,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 = {