diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:28 +0100 |
commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-ux500/board-mop500.c | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
download | talos-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.gz talos-obmc-linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.zip |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index cd54abaccd96..2cc4876db212 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -645,7 +645,7 @@ static void __init mop500_init_machine(void) MACHINE_START(U8500, "ST-Ericsson MOP500 platform") /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ - .boot_params = 0x100, + .atag_offset = 0x100, .map_io = u8500_map_io, .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ @@ -654,7 +654,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") MACHINE_END MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") - .boot_params = 0x100, + .atag_offset = 0x100, .map_io = u8500_map_io, .init_irq = ux500_init_irq, .timer = &ux500_timer, @@ -662,7 +662,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") MACHINE_END MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") - .boot_params = 0x100, + .atag_offset = 0x100, .map_io = u8500_map_io, .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ |