diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:20:21 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:20:21 +0400 |
| commit | a1a9107deff9b9e5c615058834b74717fa87d49c (patch) | |
| tree | 70686e34b8676a812a5cc63059e4ae8343ee1df1 /arch/arm/mach-exynos4/mach-smdkv310.c | |
| parent | 86f82da586098f16d92b5637808c323f5455e935 (diff) | |
| parent | 31451afd2480caf3ae15da56cf9fc3cb3fb821cb (diff) | |
| download | linux-a1a9107deff9b9e5c615058834b74717fa87d49c.tar.xz | |
Merge branch 'next-samsung-board-2' into next-samsung-devel-2
Diffstat (limited to 'arch/arm/mach-exynos4/mach-smdkv310.c')
| -rw-r--r-- | arch/arm/mach-exynos4/mach-smdkv310.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c index 35a763e9a659..cec2afabe7b4 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c @@ -372,7 +372,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, @@ -382,7 +382,7 @@ MACHINE_END MACHINE_START(SMDKC210, "SMDKC210") /* Maintainer: Kukjin Kim <kgene.kim@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, |