diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-davinci/board-tnetv107x-evm.c | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
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 78289206568..90ee7b5aabd 100644 --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c | |||
@@ -277,7 +277,7 @@ console_initcall(tnetv107x_evm_console_init); | |||
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | MACHINE_START(TNETV107X, "TNETV107X EVM") | 279 | MACHINE_START(TNETV107X, "TNETV107X EVM") |
280 | .boot_params = (TNETV107X_DDR_BASE + 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 | .timer = &davinci_timer, |