Commit 68070bde authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f9bd6ea4
...@@ -289,7 +289,7 @@ static void __init corgi_map_io(void) ...@@ -289,7 +289,7 @@ static void __init corgi_map_io(void)
MACHINE_START(CORGI, "SHARP Corgi") MACHINE_START(CORGI, "SHARP Corgi")
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.fixup = fixup_corgi, .fixup = fixup_corgi,
.map_io = corgi_map_io, .map_io = corgi_map_io,
.init_irq = corgi_init_irq, .init_irq = corgi_init_irq,
...@@ -302,7 +302,7 @@ MACHINE_END ...@@ -302,7 +302,7 @@ MACHINE_END
MACHINE_START(SHEPHERD, "SHARP Shepherd") MACHINE_START(SHEPHERD, "SHARP Shepherd")
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.fixup = fixup_corgi, .fixup = fixup_corgi,
.map_io = corgi_map_io, .map_io = corgi_map_io,
.init_irq = corgi_init_irq, .init_irq = corgi_init_irq,
...@@ -315,7 +315,7 @@ MACHINE_END ...@@ -315,7 +315,7 @@ MACHINE_END
MACHINE_START(HUSKY, "SHARP Husky") MACHINE_START(HUSKY, "SHARP Husky")
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.fixup = fixup_corgi, .fixup = fixup_corgi,
.map_io = corgi_map_io, .map_io = corgi_map_io,
.init_irq = corgi_init_irq, .init_irq = corgi_init_irq,
......
...@@ -184,7 +184,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") ...@@ -184,7 +184,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
/* Maintainer: Vibren Technologies */ /* Maintainer: Vibren Technologies */
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = idp_map_io, .map_io = idp_map_io,
.init_irq = idp_init_irq, .init_irq = idp_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
......
...@@ -271,7 +271,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") ...@@ -271,7 +271,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
/* Maintainer: MontaVista Software Inc. */ /* Maintainer: MontaVista Software Inc. */
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = lubbock_map_io, .map_io = lubbock_map_io,
.init_irq = lubbock_init_irq, .init_irq = lubbock_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
......
...@@ -348,7 +348,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") ...@@ -348,7 +348,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
/* Maintainer: MontaVista Software Inc. */ /* Maintainer: MontaVista Software Inc. */
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = mainstone_map_io, .map_io = mainstone_map_io,
.init_irq = mainstone_init_irq, .init_irq = mainstone_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
......
...@@ -182,7 +182,7 @@ static void __init poodle_map_io(void) ...@@ -182,7 +182,7 @@ static void __init poodle_map_io(void)
MACHINE_START(POODLE, "SHARP Poodle") MACHINE_START(POODLE, "SHARP Poodle")
.phys_ram = 0xa0000000, .phys_ram = 0xa0000000,
.phys_io = 0x40000000, .phys_io = 0x40000000,
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.fixup = fixup_poodle, .fixup = fixup_poodle,
.map_io = poodle_map_io, .map_io = poodle_map_io,
.init_irq = pxa_init_irq, .init_irq = pxa_init_irq,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment