diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-07 10:59:36 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-07 10:59:36 +0800 |
| commit | 8b621d0faedacca4e2d1f1d5f371e081af8ff2c1 (patch) | |
| tree | 413b4b56d4ab50302ef064e58a691e657041330c /sound/soc/samsung | |
| parent | 4f07c9ccdf92155dd8a216eee262f2954a6d69a2 (diff) | |
| parent | cc1bc54aa787c39125fe843e81bd693e8f507c32 (diff) | |
| download | linux-8b621d0faedacca4e2d1f1d5f371e081af8ff2c1.tar.gz linux-8b621d0faedacca4e2d1f1d5f371e081af8ff2c1.tar.bz2 linux-8b621d0faedacca4e2d1f1d5f371e081af8ff2c1.zip | |
Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'sound/soc/samsung')
| -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 454f41cfc828..47a7a1b633ae 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -117,7 +117,7 @@ config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" depends on SND_SOC_SAMSUNG && ARCH_S3C24XX select SND_S3C24XX_I2S - select SND_SOC_TLV320AIC23 + select SND_SOC_TLV320AIC23_I2C select SND_SOC_SAMSUNG_SIMTEC config SND_SOC_SAMSUNG_SIMTEC_HERMES |