aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-04 05:44:34 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-04 05:44:34 -0400
commit68070bdeeca7b7af6a42c0b3e5b1247e83c22ff9 (patch)
tree1ab85ea5d91207df696311974d6fb2efdc5887a0
parentf9bd6ea446946b97208f9e1528eb5f9ef8f931cb (diff)
[PATCH] ARM: Fix non-standard PXA io_pg_offst initialisers
These didn't match my sed expression correctly, fix them up manually. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-pxa/corgi.c6
-rw-r--r--arch/arm/mach-pxa/idp.c2
-rw-r--r--arch/arm/mach-pxa/lubbock.c2
-rw-r--r--arch/arm/mach-pxa/mainstone.c2
-rw-r--r--arch/arm/mach-pxa/poodle.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 276431bf1ce..86b862f56e7 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -289,7 +289,7 @@ static void __init corgi_map_io(void)
289MACHINE_START(CORGI, "SHARP Corgi") 289MACHINE_START(CORGI, "SHARP Corgi")
290 .phys_ram = 0xa0000000, 290 .phys_ram = 0xa0000000,
291 .phys_io = 0x40000000, 291 .phys_io = 0x40000000,
292 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 292 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
293 .fixup = fixup_corgi, 293 .fixup = fixup_corgi,
294 .map_io = corgi_map_io, 294 .map_io = corgi_map_io,
295 .init_irq = corgi_init_irq, 295 .init_irq = corgi_init_irq,
@@ -302,7 +302,7 @@ MACHINE_END
302MACHINE_START(SHEPHERD, "SHARP Shepherd") 302MACHINE_START(SHEPHERD, "SHARP Shepherd")
303 .phys_ram = 0xa0000000, 303 .phys_ram = 0xa0000000,
304 .phys_io = 0x40000000, 304 .phys_io = 0x40000000,
305 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 305 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
306 .fixup = fixup_corgi, 306 .fixup = fixup_corgi,
307 .map_io = corgi_map_io, 307 .map_io = corgi_map_io,
308 .init_irq = corgi_init_irq, 308 .init_irq = corgi_init_irq,
@@ -315,7 +315,7 @@ MACHINE_END
315MACHINE_START(HUSKY, "SHARP Husky") 315MACHINE_START(HUSKY, "SHARP Husky")
316 .phys_ram = 0xa0000000, 316 .phys_ram = 0xa0000000,
317 .phys_io = 0x40000000, 317 .phys_io = 0x40000000,
318 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 318 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
319 .fixup = fixup_corgi, 319 .fixup = fixup_corgi,
320 .map_io = corgi_map_io, 320 .map_io = corgi_map_io,
321 .init_irq = corgi_init_irq, 321 .init_irq = corgi_init_irq,
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index f82f5aad560..386e107b53c 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -184,7 +184,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
184 /* Maintainer: Vibren Technologies */ 184 /* Maintainer: Vibren Technologies */
185 .phys_ram = 0xa0000000, 185 .phys_ram = 0xa0000000,
186 .phys_io = 0x40000000, 186 .phys_io = 0x40000000,
187 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 187 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
188 .map_io = idp_map_io, 188 .map_io = idp_map_io,
189 .init_irq = idp_init_irq, 189 .init_irq = idp_init_irq,
190 .timer = &pxa_timer, 190 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index e30b7c62270..6309853b59b 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -271,7 +271,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
271 /* Maintainer: MontaVista Software Inc. */ 271 /* Maintainer: MontaVista Software Inc. */
272 .phys_ram = 0xa0000000, 272 .phys_ram = 0xa0000000,
273 .phys_io = 0x40000000, 273 .phys_io = 0x40000000,
274 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 274 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
275 .map_io = lubbock_map_io, 275 .map_io = lubbock_map_io,
276 .init_irq = lubbock_init_irq, 276 .init_irq = lubbock_init_irq,
277 .timer = &pxa_timer, 277 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 5d2f76b6df0..827b7b5a5be 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -348,7 +348,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
348 /* Maintainer: MontaVista Software Inc. */ 348 /* Maintainer: MontaVista Software Inc. */
349 .phys_ram = 0xa0000000, 349 .phys_ram = 0xa0000000,
350 .phys_io = 0x40000000, 350 .phys_io = 0x40000000,
351 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 351 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
352 .map_io = mainstone_map_io, 352 .map_io = mainstone_map_io,
353 .init_irq = mainstone_init_irq, 353 .init_irq = mainstone_init_irq,
354 .timer = &pxa_timer, 354 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index ebae969e883..0e4f6fab100 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -182,7 +182,7 @@ static void __init poodle_map_io(void)
182MACHINE_START(POODLE, "SHARP Poodle") 182MACHINE_START(POODLE, "SHARP Poodle")
183 .phys_ram = 0xa0000000, 183 .phys_ram = 0xa0000000,
184 .phys_io = 0x40000000, 184 .phys_io = 0x40000000,
185 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) 185 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
186 .fixup = fixup_poodle, 186 .fixup = fixup_poodle,
187 .map_io = poodle_map_io, 187 .map_io = poodle_map_io,
188 .init_irq = pxa_init_irq, 188 .init_irq = pxa_init_irq,