diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 14:00:15 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 14:00:15 -0400 |
| commit | 127d4eb97b7bebc15fd692603263e75c220e24f9 (patch) | |
| tree | 984ff729eafadf38d972c7a0253d6fc778d3e6ac /arch/arm/mach-exynos4/mach-smdkv310.c | |
| parent | e2d7fbbd7ee0daa0588e3d7f00a3c3cccb295a19 (diff) | |
| parent | 31451afd2480caf3ae15da56cf9fc3cb3fb821cb (diff) | |
Merge branch 'samsung/board' into next/board
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 a16eb569a3e6..2c1a076c6a73 100644 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c | |||
| @@ -324,7 +324,7 @@ static void __init smdkv310_machine_init(void) | |||
| 324 | MACHINE_START(SMDKV310, "SMDKV310") | 324 | MACHINE_START(SMDKV310, "SMDKV310") |
| 325 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 325 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 326 | /* Maintainer: Changhwan Youn <chaos.youn@samsung.com> */ | 326 | /* Maintainer: Changhwan Youn <chaos.youn@samsung.com> */ |
| 327 | .boot_params = S5P_PA_SDRAM + 0x100, | 327 | .atag_offset = 0x100, |
| 328 | .init_irq = exynos4_init_irq, | 328 | .init_irq = exynos4_init_irq, |
| 329 | .map_io = smdkv310_map_io, | 329 | .map_io = smdkv310_map_io, |
| 330 | .init_machine = smdkv310_machine_init, | 330 | .init_machine = smdkv310_machine_init, |
| @@ -333,7 +333,7 @@ MACHINE_END | |||
| 333 | 333 | ||
| 334 | MACHINE_START(SMDKC210, "SMDKC210") | 334 | MACHINE_START(SMDKC210, "SMDKC210") |
| 335 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 335 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 336 | .boot_params = S5P_PA_SDRAM + 0x100, | 336 | .atag_offset = 0x100, |
| 337 | .init_irq = exynos4_init_irq, | 337 | .init_irq = exynos4_init_irq, |
| 338 | .map_io = smdkv310_map_io, | 338 | .map_io = smdkv310_map_io, |
| 339 | .init_machine = smdkv310_machine_init, | 339 | .init_machine = smdkv310_machine_init, |