summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-da830-evm.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:28 +0100
commit929f58aeeb46f964d9468ce1addd993f5d92b11d (patch)
tree95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-davinci/board-da830-evm.c
parentMerge branch 'depends/rmk/smp' into tmp (diff)
parentARM: 7127/1: hw_breakpoint: skip v7-specific reset on v6 cores (diff)
downloadlinux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.xz
linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.zip
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-davinci/board-da830-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-da830-evm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 84fd78684868..26d94c0b555c 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -676,7 +676,7 @@ static void __init da830_evm_map_io(void)
}
MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
- .boot_params = (DA8XX_DDR_BASE + 0x100),
+ .atag_offset = 0x100,
.map_io = da830_evm_map_io,
.init_irq = cp_intc_init,
.timer = &davinci_timer,