Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Russell King
and committed by
Russell King
68070bde
f9bd6ea4
+7
-7
+3
-3
arch/arm/mach-pxa/corgi.c
+3
-3
arch/arm/mach-pxa/corgi.c
···
289
289
MACHINE_START(CORGI, "SHARP Corgi")
290
290
.phys_ram = 0xa0000000,
291
291
.phys_io = 0x40000000,
292
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
292
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
293
293
.fixup = fixup_corgi,
294
294
.map_io = corgi_map_io,
295
295
.init_irq = corgi_init_irq,
···
302
302
MACHINE_START(SHEPHERD, "SHARP Shepherd")
303
303
.phys_ram = 0xa0000000,
304
304
.phys_io = 0x40000000,
305
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
305
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
306
306
.fixup = fixup_corgi,
307
307
.map_io = corgi_map_io,
308
308
.init_irq = corgi_init_irq,
···
315
315
MACHINE_START(HUSKY, "SHARP Husky")
316
316
.phys_ram = 0xa0000000,
317
317
.phys_io = 0x40000000,
318
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
318
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
319
319
.fixup = fixup_corgi,
320
320
.map_io = corgi_map_io,
321
321
.init_irq = corgi_init_irq,
+1
-1
arch/arm/mach-pxa/idp.c
+1
-1
arch/arm/mach-pxa/idp.c
···
184
184
/* Maintainer: Vibren Technologies */
185
185
.phys_ram = 0xa0000000,
186
186
.phys_io = 0x40000000,
187
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
187
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
188
188
.map_io = idp_map_io,
189
189
.init_irq = idp_init_irq,
190
190
.timer = &pxa_timer,
+1
-1
arch/arm/mach-pxa/lubbock.c
+1
-1
arch/arm/mach-pxa/lubbock.c
···
271
271
/* Maintainer: MontaVista Software Inc. */
272
272
.phys_ram = 0xa0000000,
273
273
.phys_io = 0x40000000,
274
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
274
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
275
275
.map_io = lubbock_map_io,
276
276
.init_irq = lubbock_init_irq,
277
277
.timer = &pxa_timer,
+1
-1
arch/arm/mach-pxa/mainstone.c
+1
-1
arch/arm/mach-pxa/mainstone.c
···
348
348
/* Maintainer: MontaVista Software Inc. */
349
349
.phys_ram = 0xa0000000,
350
350
.phys_io = 0x40000000,
351
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
351
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
352
352
.map_io = mainstone_map_io,
353
353
.init_irq = mainstone_init_irq,
354
354
.timer = &pxa_timer,
+1
-1
arch/arm/mach-pxa/poodle.c
+1
-1
arch/arm/mach-pxa/poodle.c
···
182
182
MACHINE_START(POODLE, "SHARP Poodle")
183
183
.phys_ram = 0xa0000000,
184
184
.phys_io = 0x40000000,
185
-
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
185
+
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
186
186
.fixup = fixup_poodle,
187
187
.map_io = poodle_map_io,
188
188
.init_irq = pxa_init_irq,