diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 19:49:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 19:49:04 +0200 |
| commit | 3333222484dc7e46fd17cc1d394088fb0d963e6c (patch) | |
| tree | 0b2c74327cf0ae200030c9892e6b267fd9a26bb1 /drivers/dma/Kconfig | |
| parent | Merge tag 'powerpc-4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mp... (diff) | |
| parent | dmaengine: increment privatecnt when using dma_get_any_slave_channel (diff) | |
| download | linux-3333222484dc7e46fd17cc1d394088fb0d963e6c.tar.xz linux-3333222484dc7e46fd17cc1d394088fb0d963e6c.zip | |
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave dmaengine fixes from Vinod Koul:
"Here are the fixes in dmaengine subsystem for rc2:
- privatecnt fix for slave dma request API by Christopher
- warn fix for PM ifdef in usb-dmac by Geert
- fix hardware dependency for xgene by Jean"
* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: increment privatecnt when using dma_get_any_slave_channel
dmaengine: xgene: Set hardware dependency
dmaengine: usb-dmac: Protect PM-only functions to kill warning
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index fd7ac13f2574..bda2cb06dc7a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -437,6 +437,7 @@ config IMG_MDC_DMA config XGENE_DMA tristate "APM X-Gene DMA support" + depends on ARCH_XGENE || COMPILE_TEST select DMA_ENGINE select DMA_ENGINE_RAID select ASYNC_TX_ENABLE_CHANNEL_SWITCH |