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-davinci/board-tnetv107x-evm.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-davinci/board-tnetv107x-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c index be3099733b1f..4f416023d4e2 100644 --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c | |||
| @@ -280,7 +280,7 @@ MACHINE_START(TNETV107X, "TNETV107X EVM") | |||
| 280 | .atag_offset = 0x100, | 280 | .atag_offset = 0x100, |
| 281 | .map_io = tnetv107x_init, | 281 | .map_io = tnetv107x_init, |
| 282 | .init_irq = cp_intc_init, | 282 | .init_irq = cp_intc_init, |
| 283 | .timer = &davinci_timer, | 283 | .init_time = davinci_timer_init, |
| 284 | .init_machine = tnetv107x_evm_board_init, | 284 | .init_machine = tnetv107x_evm_board_init, |
| 285 | .init_late = davinci_init_late, | 285 | .init_late = davinci_init_late, |
| 286 | .dma_zone_size = SZ_128M, | 286 | .dma_zone_size = SZ_128M, |