Hi Peter, On Thu, 30 Aug 2012 17:06:15 +0300 Peter Ujfalusi <peter.ujfalusi@xxxxxx> wrote: > > Part of commit (which patches sound/soc/omap/mcbsp.c file): > 8fef626 ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code > > since the tree where it has been applied did not had the earlier patch: > d0db84e ASoC: omap-mcbsp: Fix 6pin mux configuration > which changed code around omap_mcbsp_6pin_src_mux(). > > Because of the missing part from 8fef626 the sound/soc/omap/mcbsp.c does > not compile in linux-next. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx> I used this as a merge fix patch when I merged the sound-asoc tree today. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpuvw0zijSdq.pgp
Description: PGP signature
