Merge tag 'md/4.4-rc0-fix' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 992efc8e465ee5055a15d9ccec5c6aa54379ca2c..e6cd1a32025a916cec7d219d4693c7c71e4c09a9 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -229,7 +229,7 @@ config IMX_SDMA
          Support the i.MX SDMA engine. This engine is integrated into
          Freescale i.MX25/31/35/51/53/6 chips.
 
-config IDMA64
+config INTEL_IDMA64
        tristate "Intel integrated DMA 64-bit support"
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
@@ -486,6 +486,7 @@ config TI_EDMA
        depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
+       select TI_DMA_CROSSBAR if ARCH_OMAP
        default n
        help
          Enable support for the TI EDMA controller. This DMA