Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
sound/soc/ep93xx/ep93xx-pcm.c between commit d7a42e1033b2 ("ASoC:
ep93xx-pcm: Use dmaengine PCM helper functions") from the sound tree and
commit 16052827d98f ("dmaengine/dma_slave: introduce inline wrappers")
from the slave-dma tree.
The former commit seems to have removed the need for the part of the
latter that affects this file. I just used the version from the sound
tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpkqtfeTBqBF.pgp
Description: PGP signature
