diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 19:31:18 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 19:31:18 +0400 |
commit | 3a2ac12f8eadaee97ad0337d81280547ab7a3311 (patch) | |
tree | 92f9a25f8cdac19cfe174de41a3751cc36fa6a57 /drivers/dma | |
parent | 7196be58ca832b6b37965921714849276f8996bc (diff) | |
parent | e4a899d9bd5d18f5568be88f7ec8edf4cd107a94 (diff) | |
download | linux-3a2ac12f8eadaee97ad0337d81280547ab7a3311.tar.xz |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/edma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index d08c4dedef35..b512caf46944 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -982,6 +982,7 @@ static void __init edma_chan_init(struct edma_cc *ecc, #define EDMA_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ + BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \ BIT(DMA_SLAVE_BUSWIDTH_4_BYTES)) static int edma_dma_device_slave_caps(struct dma_chan *dchan, |