diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-17 20:35:44 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-17 20:35:44 (GMT) |
| commit | c917c1d0151667768d22fb96d083a11e3dac5f36 (patch) | |
| tree | b9904286faba7f57e8c1a4da6206cc6a255a9dd3 /arch/arm/mach-s3c2440/mach-osiris.c | |
| parent | 77f4025b5e7b290f5c3cc03aa6242328694c71d4 (diff) | |
| parent | 0c3ee078251b85812e585b5cf5d1635afd73f4e2 (diff) | |
| download | linux-fsl-qoriq-c917c1d0151667768d22fb96d083a11e3dac5f36.tar.xz | |
Merge branch 'v2630-rc2-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
| -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 41a00f5..c8a4668 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, |