Pull misc-2.6.40 into release branch

[mv-sheeva.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 76f6472ba315f6bd57f03fc4b2e8b6738e4df5eb..a572600e44eb3e28d10b3b52b748eac5419661fd 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -82,7 +82,7 @@ config INTEL_IOP_ADMA
 
 config DW_DMAC
        tristate "Synopsys DesignWare AHB DMA support"
-       depends on AVR32
+       depends on HAVE_CLK
        select DMA_ENGINE
        default y if CPU_AT32AP7000
        help
@@ -221,7 +221,7 @@ config IMX_SDMA
 
 config IMX_DMA
        tristate "i.MX DMA support"
-       depends on ARCH_MX1 || ARCH_MX21 || MACH_MX27
+       depends on IMX_HAVE_DMA_V1
        select DMA_ENGINE
        help
          Support the i.MX DMA engine. This engine is integrated into