Merge branch 'topic/sprd' into for-linus

This commit is contained in:
Vinod Koul 2018-01-31 13:50:52 +05:30
commit 581f5b1431

View file

@ -710,7 +710,7 @@ static int sprd_dma_config(struct dma_chan *chan, struct sprd_dma_desc *sdesc,
return 0;
}
struct dma_async_tx_descriptor *
static struct dma_async_tx_descriptor *
sprd_dma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
size_t len, unsigned long flags)
{