diff options
| author | Joachim Eastwood <manabian@gmail.com> | 2013-01-14 10:42:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-14 10:14:04 -0800 |
| commit | 90cf214d6a549bf482e3c5751ee256cc885b96ea (patch) | |
| tree | d35263667d3710138b3d2443ff7e788b4b3d252f | |
| parent | 1c2584c3a1c882fec729147a46d822522552e38c (diff) | |
| download | linux-stable-90cf214d6a549bf482e3c5751ee256cc885b96ea.tar.gz linux-stable-90cf214d6a549bf482e3c5751ee256cc885b96ea.tar.bz2 linux-stable-90cf214d6a549bf482e3c5751ee256cc885b96ea.zip | |
ARM: at91: fix board-rm9200-dt after sys_timer conversion
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>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-at91/board-rm9200-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-rm9200-dt.c index 5f9ce3da3fde..3fcb6623a33e 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, |