diff --git a/[refs] b/[refs] index aea8e9abb486..cd1173c55beb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8cf8176c7fc2c790e900595755b93e30633754d +refs/heads/master: c36623a7543e7a23ceeafbeb7b34a9e020100898 diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig index 036a4965c950..f22dbeec48a6 100644 --- a/trunk/sound/soc/s3c24xx/Kconfig +++ b/trunk/sound/soc/s3c24xx/Kconfig @@ -8,6 +8,7 @@ config SND_S3C24XX_SOC config SND_S3C24XX_SOC_I2S tristate + select S3C2410_DMA config SND_S3C_I2SV2_SOC tristate @@ -15,13 +16,16 @@ config SND_S3C_I2SV2_SOC config SND_S3C2412_SOC_I2S tristate select SND_S3C_I2SV2_SOC + select S3C2410_DMA config SND_S3C64XX_SOC_I2S tristate select SND_S3C_I2SV2_SOC + select S3C64XX_DMA config SND_S3C2443_SOC_AC97 tristate + select S3C2410_DMA select AC97_BUS select SND_SOC_AC97_BUS