[PATCH] ARM/bcmring: fix build error with sp804 clockevents init

[PATCH] ARM/bcmring: fix build error with sp804 clockevents init

[Jiandong Zheng]

Wrong API sp804_clockevents_register() was used and caused build error.
So change to use sp804_clockevents_init().

This patch was submitted a couple of times last year but unfortunately 
got lost.

Signed-off-by: Jiandong Zheng <jdzheng@broadcom.com>
---
  arch/arm/mach-bcmring/core.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 43eadbc..430da12 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/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 = {
-- 
1.7.5.4

[PATCH] ARM/bcmring: fix build error with sp804 clockevents init

[Olof Johansson]

Hi,

On Tue, Jan 3, 2012 at 10:38 AM, Jiandong Zheng <jdzheng@broadcom.com> wrote:
> Wrong API sp804_clockevents_register() was used and caused build error.
> So change to use sp804_clockevents_init().
>
> This patch was submitted a couple of times last year but unfortunately got
> lost.

Same with this patch as with the dma.c one: It's already fixed in
mainline top of tree. What tree are you working against?


-Olof

[PATCH] ARM/bcmring: fix build error with sp804 clockevents init

[Jiandong Zheng]

On 1/4/2012 2:12 PM, Olof Johansson wrote:
> Hi,
>
> On Tue, Jan 3, 2012 at 10:38 AM, Jiandong Zheng<jdzheng@broadcom.com>  wrote:
>> Wrong API sp804_clockevents_register() was used and caused build error.
>> So change to use sp804_clockevents_init().
>>
>> This patch was submitted a couple of times last year but unfortunately got
>> lost.
>
> Same with this patch as with the dma.c one: It's already fixed in
> mainline top of tree. What tree are you working against?
>
>
Yes, you are right. I forgot to check the latest in linus's tree and 
stays at 3.1.0.

Please discard this and another one in dma.c.

Thanks.
JD