Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

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

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 3215a3cb3de863ff8649187fe61c72976cb555a8..6825957c97fb9896dbfa944e6c5520928160a74c 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -79,25 +79,7 @@ config INTEL_IOP_ADMA
        help
          Enable support for the Intel(R) IOP Series RAID engines.
 
-config DW_DMAC
-       tristate "Synopsys DesignWare AHB DMA support"
-       depends on GENERIC_HARDIRQS
-       select DMA_ENGINE
-       default y if CPU_AT32AP7000
-       help
-         Support the Synopsys DesignWare AHB DMA controller.  This
-         can be integrated in chips such as the Atmel AT32ap7000.
-
-config DW_DMAC_BIG_ENDIAN_IO
-       bool "Use big endian I/O register access"
-       default y if AVR32
-       depends on DW_DMAC
-       help
-         Say yes here to use big endian I/O access when reading and writing
-         to the DMA controller registers. This is needed on some platforms,
-         like the Atmel AVR32 architecture.
-
-         If unsure, use the default setting.
+source "drivers/dma/dw/Kconfig"
 
 config AT_HDMAC
        tristate "Atmel AHB DMA support"
@@ -312,6 +294,12 @@ config MMP_PDMA
        help
          Support the MMP PDMA engine for PXA and MMP platfrom.
 
+config DMA_JZ4740
+       tristate "JZ4740 DMA support"
+       depends on MACH_JZ4740
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+
 config DMA_ENGINE
        bool