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

[linux-2.6-block.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 8990d483988bb767dd1ca98a4437f82d14ad50d7..a874b6ec6650f33275c8a59ddb1d00a78c4271e9 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -184,7 +184,7 @@ config TEGRA20_APB_DMA
 
 config S3C24XX_DMAC
        tristate "Samsung S3C24XX DMA support"
-       depends on ARCH_S3C24XX && !S3C24XX_DMA
+       depends on ARCH_S3C24XX
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
        help