diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:54 +0000 |
| commit | 56fe48976db38ed3984e0e68b71e503e8179dd89 (patch) | |
| tree | caf23a5fecb04977bf2cc20229ab5502f6ccad2c /sound/soc/codecs/Kconfig | |
| parent | 1727428de8e57b3800f850bc6fff4eee58461e6d (diff) | |
| parent | e00447fafbf7daf2cd49205b97e63d9734068a4f (diff) | |
| download | linux-56fe48976db38ed3984e0e68b71e503e8179dd89.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 32d7a6f04b7d..1a8ff1e541ef 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -85,6 +85,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_TLV320AIC23_I2C if I2C select SND_SOC_TLV320AIC23_SPI if SPI_MASTER select SND_SOC_TLV320AIC26 if SPI_MASTER + select SND_SOC_TLV320AIC31XX if I2C select SND_SOC_TLV320AIC32X4 if I2C select SND_SOC_TLV320AIC3X if I2C select SND_SOC_TPA6130A2 if I2C @@ -449,6 +450,9 @@ config SND_SOC_TLV320AIC26 tristate depends on SPI +config SND_SOC_TLV320AIC31XX + tristate + config SND_SOC_TLV320AIC32X4 tristate |