diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
| commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
| tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-exynos4/mach-smdkc210.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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, |