On Tuesday 13 January 2015 11:16:36 Stephen Rothwell wrote: > - imx6q-tx6q-1110.dtb \ > - imx6sl-evk.dtb \ > + imx6q-tx6q-1110.dtb > +dtb-$(CONFIG_SOC_IMX6SL) += \ > + imx6sl-evk.dtb > +dtb-$(CONFIG_SOC_IMX6SX) += \ > + imx6sx-sabreauto.dtb \ > imx6sx-sdb.dtb \ > +dtb-$(CONFIG_SOC_LS1021A) += \ > ls1021a-qds.dtb \ > - ls1021a-twr.dtb \ > + ls1021a-twr.dtb > +dtb-$(CONFIG_SOC_VF610) += \ > There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused build errors for me. We should soon be able to merge the other branches into arm-soc to avoid the entire set of merge conflicts, until then please change your recorded resolution to avoid the build error. Thanks! Arnd -- 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
