diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:12 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:14:51 -0400 |
commit | c5e587a2bf189b28be06306c42bb26aa70dbc70b (patch) | |
tree | 312d0252c8c92ce9de20a1f86a8fbfc1b66efb8b /arch/arm/mach-integrator | |
parent | dc8f1907663e9d8f3f118e23c459f7707a7f7554 (diff) |
ARM: mach-integrator: convert boot_params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 2fbbdd5eac35..eaa95bdadcac 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -457,7 +457,7 @@ static struct sys_timer ap_timer = { | |||
457 | 457 | ||
458 | MACHINE_START(INTEGRATOR, "ARM-Integrator") | 458 | MACHINE_START(INTEGRATOR, "ARM-Integrator") |
459 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 459 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
460 | .boot_params = 0x00000100, | 460 | .atag_offset = 0x100, |
461 | .reserve = integrator_reserve, | 461 | .reserve = integrator_reserve, |
462 | .map_io = ap_map_io, | 462 | .map_io = ap_map_io, |
463 | .init_early = integrator_init_early, | 463 | .init_early = integrator_init_early, |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 4eb03ab5cb46..5de49c33e4d4 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -492,7 +492,7 @@ static struct sys_timer cp_timer = { | |||
492 | 492 | ||
493 | MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") | 493 | MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") |
494 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 494 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
495 | .boot_params = 0x00000100, | 495 | .atag_offset = 0x100, |
496 | .reserve = integrator_reserve, | 496 | .reserve = integrator_reserve, |
497 | .map_io = intcp_map_io, | 497 | .map_io = intcp_map_io, |
498 | .init_early = intcp_init_early, | 498 | .init_early = intcp_init_early, |