diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-s5p64x0 | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s5p64x0')
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index 346f8dfa6f35..3b84e9bfd073 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c | |||
| @@ -171,7 +171,7 @@ static void __init smdk6440_machine_init(void) | |||
| 171 | 171 | ||
| 172 | MACHINE_START(SMDK6440, "SMDK6440") | 172 | MACHINE_START(SMDK6440, "SMDK6440") |
| 173 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 173 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 174 | .boot_params = S5P64X0_PA_SDRAM + 0x100, | 174 | .atag_offset = 0x100, |
| 175 | 175 | ||
| 176 | .init_irq = s5p6440_init_irq, | 176 | .init_irq = s5p6440_init_irq, |
| 177 | .map_io = smdk6440_map_io, | 177 | .map_io = smdk6440_map_io, |
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, |