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-omap2/board-am3517evm.c | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index f3006c304150..1325085e453d 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -490,7 +490,7 @@ static void __init am3517_evm_init(void) | |||
490 | } | 490 | } |
491 | 491 | ||
492 | MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") | 492 | MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") |
493 | .boot_params = 0x80000100, | 493 | .atag_offset = 0x100, |
494 | .reserve = omap_reserve, | 494 | .reserve = omap_reserve, |
495 | .map_io = omap3_map_io, | 495 | .map_io = omap3_map_io, |
496 | .init_early = am3517_evm_init_early, | 496 | .init_early = am3517_evm_init_early, |