diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-at91/board-eb01.c | |
parent | Merge branch 'depends/rmk-psci' into next/virt (diff) | |
parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
download | linux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz linux-5f48a29f1721736930b7817b430039c1d348dd05.zip |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-at91/board-eb01.c')
-rw-r--r-- | arch/arm/mach-at91/board-eb01.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c index b489388a6f84..becf0a6a289e 100644 --- a/arch/arm/mach-at91/board-eb01.c +++ b/arch/arm/mach-at91/board-eb01.c @@ -44,7 +44,7 @@ static void __init at91eb01_init_early(void) MACHINE_START(AT91EB01, "Atmel AT91 EB01") /* Maintainer: Greg Ungerer <gerg@snapgear.com> */ - .timer = &at91x40_timer, + .init_time = at91x40_timer_init, .handle_irq = at91_aic_handle_irq, .init_early = at91eb01_init_early, .init_irq = at91eb01_init_irq, |