diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 10:54:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 10:54:26 -0800 |
| commit | 4554c135a0a017f4cd96f7c0612cb7ca78c68d08 (patch) | |
| tree | 7233d0c493223fb3769c4dd0668bd8da4fd02241 /include | |
| parent | 82bdc843c2be0ce199e8e247dfb2a17248cbd6c4 (diff) | |
| parent | 94ac27a54be6a14948f0a9b3f542b4ff1faac232 (diff) | |
| download | linux-stable-4554c135a0a017f4cd96f7c0612cb7ca78c68d08.tar.gz linux-stable-4554c135a0a017f4cd96f7c0612cb7ca78c68d08.tar.bz2 linux-stable-4554c135a0a017f4cd96f7c0612cb7ca78c68d08.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
i.MX SDMA: Fix burstsize settings
ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
dma: sh_dma: not all SH DMAC implementations support MEMCPY
at_hdmac: bugfix for enabling channel irq
dmaengine: fix missing 'cnt' in ?: in dmatest
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_dma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index 8cd7fe59cf1a..425450b980b8 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h @@ -70,6 +70,7 @@ struct sh_dmae_pdata { unsigned int needs_tend_set:1; unsigned int no_dmars:1; unsigned int chclr_present:1; + unsigned int slave_only:1; }; /* DMA register */ |