On 03/03/2012 08:04 PM, Tony Lindgren wrote: > Then looks like there's a mismerge with ASoC. And ASoC patch > "[PATCH v3 2/3] MFD: twl6040: Convert to i2c driver, and separate > it from twl core" that produces another build error. > > Looks like we also have a new section warning with ASoC changes: > > WARNING: arch/arm/mach-omap2/built-in.o(.text+0x14504): Section mismatch in reference from the function omap4_pmic_init() to th > The function omap4_pmic_init() references > the (unknown reference) __initdata (unknown). > This is often because omap4_pmic_init lacks a __initdata > annotation or the annotation of (unknown) is wrong. > > Peter, care to look if below is right resolve for the > mismerge? Also can you please also fix the new section > warning? I have sent a revert series (you were on the CC) to Samuel regarding to this series going via the MFD tree. I have the corrected series waiting for the event Samuel applies the reverts on his for-next branch, so we can queue the fixed patches via ASoC. -- Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html