diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-at91/board-sam9g20ek.c | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 1b7dd9f688d3..f9cd1f2c7146 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
| @@ -409,7 +409,7 @@ static void __init ek_board_init(void) | |||
| 409 | 409 | ||
| 410 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") | 410 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") |
| 411 | /* Maintainer: Atmel */ | 411 | /* Maintainer: Atmel */ |
| 412 | .timer = &at91sam926x_timer, | 412 | .init_time = at91sam926x_pit_init, |
| 413 | .map_io = at91_map_io, | 413 | .map_io = at91_map_io, |
| 414 | .handle_irq = at91_aic_handle_irq, | 414 | .handle_irq = at91_aic_handle_irq, |
| 415 | .init_early = ek_init_early, | 415 | .init_early = ek_init_early, |
| @@ -419,7 +419,7 @@ MACHINE_END | |||
| 419 | 419 | ||
| 420 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") | 420 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") |
| 421 | /* Maintainer: Atmel */ | 421 | /* Maintainer: Atmel */ |
| 422 | .timer = &at91sam926x_timer, | 422 | .init_time = at91sam926x_pit_init, |
| 423 | .map_io = at91_map_io, | 423 | .map_io = at91_map_io, |
| 424 | .handle_irq = at91_aic_handle_irq, | 424 | .handle_irq = at91_aic_handle_irq, |
| 425 | .init_early = ek_init_early, | 425 | .init_early = ek_init_early, |