Hi Sascha,
Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/Makefile between commit 95b8f20fd6a2694a16b8addb190b942bfb670c88
("ARM: fix badly placed mach/plat entries in Kconfig & Makefile") from
Linus' tree and commit b996b5830364c1b1d2469be574f4ebe831987ba9 ("mxc:
Add support for the Babbage board (i.MX5)") from the i.MX tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/Makefile
index c7f6f41,056daf8..0000000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -146,7 -146,7 +146,8 @@@ machine-$(CONFIG_ARCH_MX1) := mx
machine-$(CONFIG_ARCH_MX2) := mx2
machine-$(CONFIG_ARCH_MX25) := mx25
machine-$(CONFIG_ARCH_MX3) := mx3
+ machine-$(CONFIG_ARCH_MX5) := mx5
+machine-$(CONFIG_ARCH_MXC91231) := mxc91231
machine-$(CONFIG_ARCH_NETX) := netx
machine-$(CONFIG_ARCH_NOMADIK) := nomadik
machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
--
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
