Hi, * Peter Ujfalusi <peter.ujfalusi@xxxxxx> [111214 01:17]: > To avoid breakage in audio support with the coming change > in ASoC machine driver (conversion to platfrom device). > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx> This series looks OK to me to queue via the ASoC tree: Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> To avoid merge conflicts, you should base the branch on commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a (ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes) in Russell's devel-stable branch because of the common.h changes. This is because at least.. > --- a/arch/arm/mach-omap2/board-4430sdp.c > +++ b/arch/arm/mach-omap2/board-4430sdp.c > @@ -25,6 +25,7 @@ > #include <linux/regulator/fixed.h> > #include <linux/leds.h> > #include <linux/leds_pwm.h> > +#include <linux/platform_data/omap-abe-twl6040.h> > > #include <mach/hardware.h> > #include <mach/omap4-common.h> ..omap4-common.h no longer exists. Just guessing, might be worth trying a test merge to see what happens. Regards, Tony -- 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
