diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-14 10:16:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-14 10:16:35 -0800 |
| commit | 00c82d64405631967dca3890a9ce80ab35d04cc7 (patch) | |
| tree | 2ef1fccade5b6ca2905c689ed81278fe2811acdc | |
| parent | fd41d91df99be02f4fc3fe79d707d2786d6e40eb (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | linux-stable-00c82d64405631967dca3890a9ce80ab35d04cc7.tar.gz linux-stable-00c82d64405631967dca3890a9ce80ab35d04cc7.tar.bz2 linux-stable-00c82d64405631967dca3890a9ce80ab35d04cc7.zip | |
Merge branch 'timer/cleanup' into next/cleanup
One more board file fixup from the sys_timer cleanup.
* timer/cleanup:
ARM: at91: fix board-rm9200-dt after sys_timer conversion
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, |