diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-15 10:56:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-15 10:56:39 -0800 |
| commit | edb42dc7bc0da0125ceacab810a553ce1f0cac8d (patch) | |
| tree | ea9e7f82c887a8ae982450350d7c5d4a99d806fc /include | |
| parent | Merge tag 'fbdev-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux (diff) | |
| parent | dmaengine: at_xdmac: fix at_xdmac_prep_dma_memcpy() (diff) | |
| download | linux-dev-edb42dc7bc0da0125ceacab810a553ce1f0cac8d.tar.xz linux-dev-edb42dc7bc0da0125ceacab810a553ce1f0cac8d.zip | |
Merge tag 'dmaengine-fix-4.4-rc6' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"This has fixes spread thru driver, notably among them:
- edma fixes for recent edma DT changes which went into 4.4
- odd fixes for at_hdmac
- minor fixes on bc dma and mic dma"
* tag 'dmaengine-fix-4.4-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: at_xdmac: fix at_xdmac_prep_dma_memcpy()
dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type
dmaengine: edma: DT: Change memcpy channel array from 16bit to 32bit type
dmaengine: mic_x100: add missing spin_unlock
dmaengine: bcm2835-dma: Convert to use DMA pool
dmaengine: at_xdmac: fix bad behavior in interleaved mode
dmaengine: at_xdmac: fix false condition for memset_sg transfers
dmaengine: at_xdmac: fix macro typo
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/edma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index e2878baeb90e..4299f4ba03bd 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -72,7 +72,7 @@ struct edma_soc_info { struct edma_rsv_info *rsv; /* List of channels allocated for memcpy, terminated with -1 */ - s16 *memcpy_channels; + s32 *memcpy_channels; s8 (*queue_priority_mapping)[2]; const s16 (*xbar_chans)[2]; |