Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/mach-smdkc210.c between commit 2be5a4a7da6e ("ARM:
mach-exynos4: convert boot_params to atag_offset") from the arm and
arm-soc trees and commit 42c0d26d2c32 ("ARM: EXYNOS4: Turn the
mach-smdkc210.c into mach-smdv310.c") from the s5p tree.
The latter removed the file, so I did that and then applied the following
patch to arch/arm/mach-exynos4/mach-smdkv310.c. I can carry the fixes as
necessary.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 30 Aug 2011 12:07:41 +1000
Subject: [PATCH] s5p: merge fixup for atags_offset use
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
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 1277d72..e479171 100644
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -344,7 +344,7 @@ MACHINE_END
MACHINE_START(SMDKC210, "SMDKC210")
/* Maintainer: Kukjin Kim <kgene.kim@xxxxxxxxxxx> */
- .boot_params = S5P_PA_SDRAM + 0x100,
+ .atag_offset = 0x100,
.init_irq = exynos4_init_irq,
.map_io = smdkv310_map_io,
.init_machine = smdkv310_machine_init,
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
