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-s5p64x0/mach-smdk6450.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-s5p64x0/mach-smdk6450.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 33f2adf8f3fe..d99d29b5558e 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c | |||
| @@ -190,7 +190,7 @@ static void __init smdk6450_machine_init(void) | |||
| 190 | 190 | ||
| 191 | MACHINE_START(SMDK6450, "SMDK6450") | 191 | MACHINE_START(SMDK6450, "SMDK6450") |
| 192 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 192 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 193 | .boot_params = S5P64X0_PA_SDRAM + 0x100, | 193 | .atag_offset = 0x100, |
| 194 | 194 | ||
| 195 | .init_irq = s5p6450_init_irq, | 195 | .init_irq = s5p6450_init_irq, |
| 196 | .map_io = smdk6450_map_io, | 196 | .map_io = smdk6450_map_io, |