On Thu, 2012-03-22 at 13:41 +1100, Stephen Rothwell wrote: > On Thu, 22 Mar 2012 13:39:30 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > Today's linux-next merge of the slave-dma tree got a conflict in > > sound/soc/imx/imx-pcm-dma-mx2.c between commit c307e8e32e11 ("ASoC: > > imx-pcm-dma: Use dmaengine PCM helper functions") from the sound tree and > > commit 16052827d98f ("dmaengine/dma_slave: introduce inline wrappers") > > from the slave-dma tree. > > > > I just use dthe version from the sound tree. > > The same with sound/soc/mxs/mxs-pcm.c . Thanks Stephan, and sorry for delay in responding was away for the weekend. This should be fixed now with MArk applying the fix from Fabio Estevam. I see this is in asoc-next. -- ~Vinod -- 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