diff mbox

ARM: at91: fix board-rm9200-dt after sys_timer conversion

Message ID 1358185342-7518-1-git-send-email-swarren@wwwdotorg.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Warren Jan. 14, 2013, 5:42 p.m. UTC 
From: Joachim Eastwood <manabian@gmail.com>

After "ARM: delete struct sys_timer" board-rm9200-dt
fails compilation with the following error:

  CC      arch/arm/mach-at91/board-rm9200-dt.o
arch/arm/mach-at91/board-rm9200-dt.c:50:2: error: unknown field 'timer' specified in initializer
arch/arm/mach-at91/board-rm9200-dt.c:50:13: error: 'at91rm9200_timer' undeclared here (not in a function)
make[1]: *** [arch/arm/mach-at91/board-rm9200-dt.o] Error 1
make: *** [arch/arm/mach-at91] Error 2

This is a fall out from the timer conversion. Fix it by
converting board-rm9200-dt to use new timer init
function as well.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
Olof, Arnd, another fix for the timer-cleanup branch in arm-soc.

 arch/arm/mach-at91/board-rm9200-dt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Olof Johansson Jan. 14, 2013, 6:14 p.m. UTC | #1 
On Mon, Jan 14, 2013 at 10:42:22AM -0700, Stephen Warren wrote:
> From: Joachim Eastwood <manabian@gmail.com>
> 
> After "ARM: delete struct sys_timer" board-rm9200-dt
> fails compilation with the following error:
> 
>   CC      arch/arm/mach-at91/board-rm9200-dt.o
> arch/arm/mach-at91/board-rm9200-dt.c:50:2: error: unknown field 'timer' specified in initializer
> arch/arm/mach-at91/board-rm9200-dt.c:50:13: error: 'at91rm9200_timer' undeclared here (not in a function)
> make[1]: *** [arch/arm/mach-at91/board-rm9200-dt.o] Error 1
> make: *** [arch/arm/mach-at91] Error 2
> 
> This is a fall out from the timer conversion. Fix it by
> converting board-rm9200-dt to use new timer init
> function as well.
> 
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Olof, Arnd, another fix for the timer-cleanup branch in arm-soc.

Applied to timer/cleanup. Thanks!


-Olof
diff mbox

Patch

diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-rm9200-dt.c
index 5f9ce3d..3fcb662 100644
--- a/arch/arm/mach-at91/board-rm9200-dt.c
+++ b/arch/arm/mach-at91/board-rm9200-dt.c
@@ -47,7 +47,7 @@  static const char *at91rm9200_dt_board_compat[] __initdata = {
 };
 
 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
-	.timer		= &at91rm9200_timer,
+	.init_time      = at91rm9200_timer_init,
 	.map_io		= at91_map_io,
 	.handle_irq	= at91_aic_handle_irq,
 	.init_early	= at91rm9200_dt_initialize,