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-exynos4/mach-smdkc210.c | |
| 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-exynos4/mach-smdkc210.c')
| -rw-r--r-- | arch/arm/mach-exynos4/mach-smdkc210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/mach-smdkc210.c b/arch/arm/mach-exynos4/mach-smdkc210.c index a7c65e05c1eb..b24ddd7ad8fe 100644 --- a/arch/arm/mach-exynos4/mach-smdkc210.c +++ b/arch/arm/mach-exynos4/mach-smdkc210.c | |||
| @@ -301,7 +301,7 @@ static void __init smdkc210_machine_init(void) | |||
| 301 | 301 | ||
| 302 | MACHINE_START(SMDKC210, "SMDKC210") | 302 | MACHINE_START(SMDKC210, "SMDKC210") |
| 303 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 303 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 304 | .boot_params = S5P_PA_SDRAM + 0x100, | 304 | .atag_offset = 0x100, |
| 305 | .init_irq = exynos4_init_irq, | 305 | .init_irq = exynos4_init_irq, |
| 306 | .map_io = smdkc210_map_io, | 306 | .map_io = smdkc210_map_io, |
| 307 | .init_machine = smdkc210_machine_init, | 307 | .init_machine = smdkc210_machine_init, |