diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
| commit | 3e9248c055609b11a6d62d1129fbf27ce0990ff4 (patch) | |
| tree | e9421cdfba10f6af003305cf0f639aa462f751ce /arch/arm/mach-exynos4/mach-smdkv310.c | |
| parent | 14eff7b679a0ea42049cd806545466769f8d1d2d (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.1
Diffstat (limited to 'arch/arm/mach-exynos4/mach-smdkv310.c')
| -rw-r--r-- | arch/arm/mach-exynos4/mach-smdkv310.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c index ea414955686..d90fcddbee1 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c @@ -255,7 +255,7 @@ static void __init smdkv310_machine_init(void) MACHINE_START(SMDKV310, "SMDKV310") /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ /* Maintainer: Changhwan Youn <chaos.youn@samsung.com> */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = exynos4_init_irq, .map_io = smdkv310_map_io, .init_machine = smdkv310_machine_init, |