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-nuri.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-nuri.c')
| -rw-r--r-- | arch/arm/mach-exynos4/mach-nuri.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c index 43be71b799cb..6e0536818bf5 100644 --- a/arch/arm/mach-exynos4/mach-nuri.c +++ b/arch/arm/mach-exynos4/mach-nuri.c | |||
| @@ -1152,7 +1152,7 @@ static void __init nuri_machine_init(void) | |||
| 1152 | 1152 | ||
| 1153 | MACHINE_START(NURI, "NURI") | 1153 | MACHINE_START(NURI, "NURI") |
| 1154 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ | 1154 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ |
| 1155 | .boot_params = S5P_PA_SDRAM + 0x100, | 1155 | .atag_offset = 0x100, |
| 1156 | .init_irq = exynos4_init_irq, | 1156 | .init_irq = exynos4_init_irq, |
| 1157 | .map_io = nuri_map_io, | 1157 | .map_io = nuri_map_io, |
| 1158 | .init_machine = nuri_machine_init, | 1158 | .init_machine = nuri_machine_init, |