Messages in this thread | | | Date | Thu, 22 Mar 2012 13:41:01 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the slave-dma tree with the sound tree |
| |
On Thu, 22 Mar 2012 13:39:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 . -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |