diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-at91/board-sam9rlek.c | |
parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-at91/board-sam9rlek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9rlek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 377a1097afa..aa265dcf212 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -320,7 +320,7 @@ static void __init ek_board_init(void) MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") /* Maintainer: Atmel */ - .timer = &at91sam926x_timer, + .init_time = at91sam926x_pit_init, .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, |