Merge branch 'topic/bam' into for-linus

Conflicts:
	drivers/dma/Makefile

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 830b88d8744c..edc739f986a8 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -410,4 +410,13 @@ config DMATEST
 config DMA_ENGINE_RAID
         bool
 
+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.
+
 endif