diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 10:23:58 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 10:24:16 -0700 |
| commit | d6590499e1844dca26fe19748ac455c70a84c5a0 (patch) | |
| tree | 84f0061c21635d8a849b4016ccd040a0fb36837e /sound | |
| parent | 11b815154f37045eac0baf8884d1fe7feba426ff (diff) | |
| parent | 3316dee245ef297155fa45b8d14263dfd6a9164b (diff) | |
Merge branch 'next/drivers' into for-next
* next/drivers:
ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442
dmaengine: s3c24xx-dma: add support for the s3c2410 type of controller
ARM: S3C24XX: Fix possible dma selection warning
ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device
ARM: S3C24XX: add platform-devices for new dma driver for s3c2412 and s3c2443
dmaengine: add driver for Samsung s3c24xx SoCs
ARM: S3C24XX: number the dma clocks
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 2eea1840315d..37459dfd168d 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -2,7 +2,7 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG select S3C64XX_DMA if ARCH_S3C64XX - select S3C2410_DMA if ARCH_S3C24XX + select S3C24XX_DMA if ARCH_S3C24XX help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to |