Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arch/arm/mach-pxa/corgi.c

+3 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static void __init corgi_map_io(void) 
MACHINE_START(CORGI, "SHARP Corgi")

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= corgi_map_io,

	.init_irq	= corgi_init_irq,
@@ -302,7 +302,7 @@ MACHINE_END 
MACHINE_START(SHEPHERD, "SHARP Shepherd")

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= corgi_map_io,

	.init_irq	= corgi_init_irq,
@@ -315,7 +315,7 @@ MACHINE_END 
MACHINE_START(HUSKY, "SHARP Husky")

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_corgi,

	.map_io		= corgi_map_io,

	.init_irq	= corgi_init_irq,

arch/arm/mach-pxa/idp.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") 
	/* Maintainer: Vibren Technologies */

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.map_io		= idp_map_io,

	.init_irq	= idp_init_irq,

	.timer		= &pxa_timer,

arch/arm/mach-pxa/lubbock.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") 
	/* Maintainer: MontaVista Software Inc. */

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.map_io		= lubbock_map_io,

	.init_irq	= lubbock_init_irq,

	.timer		= &pxa_timer,

arch/arm/mach-pxa/mainstone.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") 
	/* Maintainer: MontaVista Software Inc. */

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.map_io		= mainstone_map_io,

	.init_irq	= mainstone_init_irq,

	.timer		= &pxa_timer,

arch/arm/mach-pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void __init poodle_map_io(void) 
MACHINE_START(POODLE, "SHARP Poodle")

	.phys_ram	= 0xa0000000,

	.phys_io	= 0x40000000,

	.io_pg_offst	= ((io_p2v(0x40000000) >> 18) & 0xfffc,)

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.fixup		= fixup_poodle,

	.map_io		= poodle_map_io,

	.init_irq	= pxa_init_irq,