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-smdk2440.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-smdk2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-smdk2440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index eedfe0f11643..36eeb4197a84 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c | |||
| @@ -175,7 +175,7 @@ static void __init smdk2440_machine_init(void) | |||
| 175 | 175 | ||
| 176 | MACHINE_START(S3C2440, "SMDK2440") | 176 | MACHINE_START(S3C2440, "SMDK2440") |
| 177 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 177 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
| 178 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 178 | .atag_offset = 0x100, |
| 179 | 179 | ||
| 180 | .init_irq = s3c24xx_init_irq, | 180 | .init_irq = s3c24xx_init_irq, |
| 181 | .map_io = smdk2440_map_io, | 181 | .map_io = smdk2440_map_io, |