diff options
author | Nicolas Pitre <nico@cam.org> | 2006-01-13 15:51:52 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-13 15:51:52 -0500 |
commit | 946d4935fc61e1479f8c057d58c64110bb43d3b0 (patch) | |
tree | fa922ac26c5ba6bd66e6c5095ceee5cb3613ee92 /arch/arm/mach-integrator | |
parent | 2df96b34aae08e0aa688ef7a8444febb8ec44172 (diff) |
[ARM] 3260/1: remove phys_ram from struct machine_desc (part 2)
Patch from Nicolas Pitre
This field is redundent since it must be equal to PHYS_OFFSET anyway.
Now that no code uses it anymore, mark it deprecated and remove all
initializations from the tree.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 3afedeb56a6e..d8d3c2a5a97e 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -347,7 +347,6 @@ static struct sys_timer ap_timer = { | |||
347 | 347 | ||
348 | MACHINE_START(INTEGRATOR, "ARM-Integrator") | 348 | MACHINE_START(INTEGRATOR, "ARM-Integrator") |
349 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 349 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
350 | .phys_ram = 0x00000000, | ||
351 | .phys_io = 0x16000000, | 350 | .phys_io = 0x16000000, |
352 | .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc, | 351 | .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc, |
353 | .boot_params = 0x00000100, | 352 | .boot_params = 0x00000100, |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 16cf2482a3e9..31820170f306 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -578,7 +578,6 @@ static struct sys_timer cp_timer = { | |||
578 | 578 | ||
579 | MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") | 579 | MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") |
580 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 580 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
581 | .phys_ram = 0x00000000, | ||
582 | .phys_io = 0x16000000, | 581 | .phys_io = 0x16000000, |
583 | .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc, | 582 | .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc, |
584 | .boot_params = 0x00000100, | 583 | .boot_params = 0x00000100, |