diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-04-17 12:36:47 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-04-17 12:42:24 +0100 |
| commit | 2a96ad05e93be75398871a2fce932ed234d03112 (patch) | |
| tree | 8e8e55c1c84c17fe661a32d9b5c41b674acbf2ce /arch/arm | |
| parent | 019dbaa11db56d8e5d868e02421ff236a054c0d8 (diff) | |
| download | blackbird-op-linux-2a96ad05e93be75398871a2fce932ed234d03112.tar.gz blackbird-op-linux-2a96ad05e93be75398871a2fce932ed234d03112.zip | |
[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: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 41a00f57e5da..c8a46685ce38 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c @@ -413,7 +413,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, .map_io = osiris_map_io, - .init_machine = osiris_init, .init_irq = s3c24xx_init_irq, .init_machine = osiris_init, .timer = &s3c24xx_timer, |
