diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-10-14 22:21:46 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-10-20 00:27:46 -0400 |
commit | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (patch) | |
tree | 78651bbbed163fe933cd42deabebad682d7c03dc /arch/arm/mach-kirkwood/netspace_v2-setup.c | |
parent | c293393faa8e11a5a80a9e358718432b8697f451 (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-kirkwood/netspace_v2-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index fed264d28f4a..5e286441b8f4 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c | |||
@@ -215,8 +215,6 @@ static void __init netspace_v2_init(void) | |||
215 | 215 | ||
216 | #ifdef CONFIG_MACH_NETSPACE_V2 | 216 | #ifdef CONFIG_MACH_NETSPACE_V2 |
217 | MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") | 217 | MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") |
218 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
219 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
220 | .boot_params = 0x00000100, | 218 | .boot_params = 0x00000100, |
221 | .init_machine = netspace_v2_init, | 219 | .init_machine = netspace_v2_init, |
222 | .map_io = kirkwood_map_io, | 220 | .map_io = kirkwood_map_io, |
@@ -227,8 +225,6 @@ MACHINE_END | |||
227 | 225 | ||
228 | #ifdef CONFIG_MACH_INETSPACE_V2 | 226 | #ifdef CONFIG_MACH_INETSPACE_V2 |
229 | MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") | 227 | MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") |
230 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
231 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
232 | .boot_params = 0x00000100, | 228 | .boot_params = 0x00000100, |
233 | .init_machine = netspace_v2_init, | 229 | .init_machine = netspace_v2_init, |
234 | .map_io = kirkwood_map_io, | 230 | .map_io = kirkwood_map_io, |
@@ -239,8 +235,6 @@ MACHINE_END | |||
239 | 235 | ||
240 | #ifdef CONFIG_MACH_NETSPACE_MAX_V2 | 236 | #ifdef CONFIG_MACH_NETSPACE_MAX_V2 |
241 | MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") | 237 | MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") |
242 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
243 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
244 | .boot_params = 0x00000100, | 238 | .boot_params = 0x00000100, |
245 | .init_machine = netspace_v2_init, | 239 | .init_machine = netspace_v2_init, |
246 | .map_io = kirkwood_map_io, | 240 | .map_io = kirkwood_map_io, |