diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
| commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-at91/board-sam9260ek.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | talos-op-linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.gz talos-op-linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index f0135cd1d858..0b153c87521d 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -343,7 +343,7 @@ static void __init ek_board_init(void) MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-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, |
