diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-29 13:52:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-29 13:52:52 -0800 |
| commit | d073d7a1460ae1ae56a81bbb0a58d6f17917ca51 (patch) | |
| tree | 03a554995f61bd8f12d3508eae58011e0a6067e3 /drivers | |
| parent | 03773a4c177ab55a1e58bacef96f07d6074c26bd (diff) | |
| parent | d50b9e2e788dce9b120b5ac1140f0cdd1bf905eb (diff) | |
| download | linux-d073d7a1460ae1ae56a81bbb0a58d6f17917ca51.tar.gz linux-d073d7a1460ae1ae56a81bbb0a58d6f17917ca51.tar.bz2 linux-d073d7a1460ae1ae56a81bbb0a58d6f17917ca51.zip | |
Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Merge "Samsung cleanup for v3.20" from Kukjin Kim:
- remove i2c sys configuration from mach-exynos/
: all related codes moved into i2c driver
- remove Samsung specific DMA
: every Samsung stuff uses dmaengine APIs
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: remove unused DMA infrastructure
ARM: EXYNOS: Remove i2c sys configuration related code
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index f2b2c4e87aef..faf30a4e642b 100644 --- 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 |