Commit 00c82d64 authored by Olof Johansson's avatar Olof Johansson

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: default avatarOlof Johansson <olof@lixom.net>
parents fd41d91d 90cf214d
...@@ -47,7 +47,7 @@ static const char *at91rm9200_dt_board_compat[] __initdata = { ...@@ -47,7 +47,7 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
}; };
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
.timer = &at91rm9200_timer, .init_time = at91rm9200_timer_init,
.map_io = at91_map_io, .map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq, .handle_irq = at91_aic_handle_irq,
.init_early = at91rm9200_dt_initialize, .init_early = at91rm9200_dt_initialize,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment