diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:18:22 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:18:22 +0530 |
| commit | 254efeec3154bb0f373f10a069d5ad05cff9d310 (patch) | |
| tree | 4e3be2dbf6c9438ce96738d991a40abffe724680 /drivers/dma/Kconfig | |
| parent | 8bce4c87657af3dc4625e873ec1201205e44375b (diff) | |
| parent | 67a2003e060739747cfa3ea9b0d88b3d321ebf24 (diff) | |
| download | linux-254efeec3154bb0f373f10a069d5ad05cff9d310.tar.gz linux-254efeec3154bb0f373f10a069d5ad05cff9d310.tar.bz2 linux-254efeec3154bb0f373f10a069d5ad05cff9d310.zip | |
Merge branch 'topic/qcom' into for-linus
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index c77f214c9466..d96d87c56f2e 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -409,15 +409,6 @@ config PXA_DMA 16 to 32 channels for peripheral to memory or memory to memory transfers. -config QCOM_BAM_DMA - tristate "QCOM BAM DMA support" - depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM) - select DMA_ENGINE - select DMA_VIRTUAL_CHANNELS - ---help--- - Enable support for the QCOM BAM DMA controller. This controller - provides DMA capabilities for a variety of on-chip devices. - config SIRF_DMA tristate "CSR SiRFprimaII/SiRFmarco DMA support" depends on ARCH_SIRF @@ -540,6 +531,8 @@ config ZX_DMA # driver files source "drivers/dma/bestcomm/Kconfig" +source "drivers/dma/qcom/Kconfig" + source "drivers/dma/dw/Kconfig" source "drivers/dma/hsu/Kconfig" |