diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 20:45:55 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-04-05 20:45:55 +0530 |
| commit | 8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd (patch) | |
| tree | bc08b79fe11c4745434da1cebc5fb8936f9c6831 /drivers/dma/Kconfig | |
| parent | e43a34e3ec5d1b14a11c3220f5a12aa797d73cd1 (diff) | |
| parent | e7c0fe2a5c84b7bf4dcbbce30953b04b95e9dc09 (diff) | |
| download | linux-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.tar.gz linux-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.tar.bz2 linux-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.zip | |
Merge branch 'topic/bam' into for-linus
Conflicts:
drivers/dma/Makefile
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 9 |
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 |