aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2010-10-14 22:21:46 -0400
committerNicolas Pitre <nico@fluxnic.net>2010-10-20 00:27:46 -0400
commit6451d7783ba5ff24eb1a544eaa6665b890f30466 (patch)
tree78651bbbed163fe933cd42deabebad682d7c03dc /arch/arm/mach-integrator
parentc293393faa8e11a5a80a9e358718432b8697f451 (diff)
arm: remove machine_desc.io_pg_offst and .phys_io
Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c2
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 6ab5a03ab9d..548208f1117 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -500,8 +500,6 @@ static struct sys_timer ap_timer = {
500 500
501MACHINE_START(INTEGRATOR, "ARM-Integrator") 501MACHINE_START(INTEGRATOR, "ARM-Integrator")
502 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 502 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
503 .phys_io = 0x16000000,
504 .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
505 .boot_params = 0x00000100, 503 .boot_params = 0x00000100,
506 .map_io = ap_map_io, 504 .map_io = ap_map_io,
507 .reserve = integrator_reserve, 505 .reserve = integrator_reserve,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 05db40e3c4f..6258c90d020 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -599,8 +599,6 @@ static struct sys_timer cp_timer = {
599 599
600MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") 600MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
601 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 601 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
602 .phys_io = 0x16000000,
603 .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
604 .boot_params = 0x00000100, 602 .boot_params = 0x00000100,
605 .map_io = intcp_map_io, 603 .map_io = intcp_map_io,
606 .reserve = integrator_reserve, 604 .reserve = integrator_reserve,