Merge branch 'topic/omap' into for-linus

[karo-tx-linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index bda2cb06dc7a450c6e58e0145edba08acbc6f376..0205ade0ba320f2de42c9c73d5231baa27d584a8 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -245,6 +245,9 @@ config TI_EDMA
          Enable support for the TI EDMA controller. This DMA
          engine is found on TI DaVinci and AM33xx parts.
 
+config TI_DMA_CROSSBAR
+       bool
+
 config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
        bool
 
@@ -330,6 +333,7 @@ config DMA_OMAP
        depends on ARCH_OMAP
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
+       select TI_DMA_CROSSBAR if SOC_DRA7XX
 
 config DMA_BCM2835
        tristate "BCM2835 DMA engine support"