* linux-next: manual merge of the s5p tree with the i.MX tree
@ 2011-03-03 23:42 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-03-03 23:42 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Richard Zhao, Sascha Hauer
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mm/Kconfig between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
10606aadb046d008c88d1a99b309357ca33d590e ("ARM: EXYNOS4: Update Kconfig
and Makefile for the new ARCH_EXYNOS4") from the s5p tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mm/Kconfig
index 08daea9,0f59e54..0000000
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -819,8 -811,8 +819,8 @@@ config CACHE_FEROCEON_L2_WRITETHROUG
config CACHE_L2X0
bool "Enable the L2x0 outer cache controller"
depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
- REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
+ REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
- ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
+ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE
default y
select OUTER_CACHE
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-03 23:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-03 23:42 linux-next: manual merge of the s5p tree with the i.MX tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox