diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-s3c2440/mach-osiris.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index d8853639331..dc142ebf8cb 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -447,7 +447,7 @@ static void __init osiris_init(void) | |||
| 447 | 447 | ||
| 448 | MACHINE_START(OSIRIS, "Simtec-OSIRIS") | 448 | MACHINE_START(OSIRIS, "Simtec-OSIRIS") |
| 449 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ | 449 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ |
| 450 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 450 | .atag_offset = 0x100, |
| 451 | .map_io = osiris_map_io, | 451 | .map_io = osiris_map_io, |
| 452 | .init_irq = s3c24xx_init_irq, | 452 | .init_irq = s3c24xx_init_irq, |
| 453 | .init_machine = osiris_init, | 453 | .init_machine = osiris_init, |