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

[pandora-kernel.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index cd32586..446687c 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -155,6 +155,18 @@ config TEGRA20_APB_DMA
          This DMA controller transfers data from memory to peripheral fifo
          or vice versa. It does not support memory to memory data transfer.
 
+config S3C24XX_DMAC
+       tristate "Samsung S3C24XX DMA support"
+       depends on ARCH_S3C24XX && !S3C24XX_DMA
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Support for the Samsung S3C24XX DMA controller driver. The
+         DMA controller is having multiple DMA channels which can be
+         configured for different peripherals like audio, UART, SPI.
+         The DMA controller can transfer data from memory to peripheral,
+         periphal to memory, periphal to periphal and memory to memory.
+
 source "drivers/dma/sh/Kconfig"
 
 config COH901318
@@ -196,7 +208,7 @@ config SIRF_DMA
 
 config TI_EDMA
        bool "TI EDMA support"
-       depends on ARCH_DAVINCI || ARCH_OMAP
+       depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
        select TI_PRIV_EDMA
@@ -302,7 +314,7 @@ config MMP_PDMA
        depends on (ARCH_MMP || ARCH_PXA)
        select DMA_ENGINE
        help
-         Support the MMP PDMA engine for PXA and MMP platfrom.
+         Support the MMP PDMA engine for PXA and MMP platform.
 
 config DMA_JZ4740
        tristate "JZ4740 DMA support"