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

Commit 2a96ad05 authored by Ben Dooks's avatar Ben Dooks Committed by Ben Dooks
Browse files

[ARM] Osiris: Fix double initialisation in machine block 



The .init_machine entry in mach-osiris.c had the same entry
twice, so remove one definition to fix the following warning
from sparse:

mach-osiris.c:416:3: warning: Initializer entry defined twice
mach-osiris.c:418:3:   also defined here

Signed-off-by: default avatarBen Dooks <ben@simtec.co.uk>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 019dbaa1

arch/arm/mach-s3c2440/mach-osiris.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -413,7 +413,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") 
	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

	.map_io		= osiris_map_io,

	.map_io		= osiris_map_io,

	.init_machine	= osiris_init,

	.init_irq	= s3c24xx_init_irq,

	.init_irq	= s3c24xx_init_irq,

	.init_machine	= osiris_init,

	.init_machine	= osiris_init,

	.timer		= &s3c24xx_timer,

	.timer		= &s3c24xx_timer,