diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:19 +0100 |
| commit | 5b9fd76972836272afba57404d2662627926165b (patch) | |
| tree | f2030de5b09807083b1fc4d1cd6a45db9c27aa50 /sound/soc/codecs/Kconfig | |
| parent | eeb7f91e3511d2b1338b3fae915e800d781627f8 (diff) | |
| parent | 28dbd1611f5701c9b5b8c07924c1bd2ad6f64435 (diff) | |
| download | blackbird-op-linux-5b9fd76972836272afba57404d2662627926165b.tar.gz blackbird-op-linux-5b9fd76972836272afba57404d2662627926165b.zip | |
Merge remote-tracking branch 'asoc/topic/tas5086' 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 cf7b9897fa6b..2f45f00e31b0 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -64,6 +64,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_STA32X if I2C select SND_SOC_STA529 if I2C select SND_SOC_STAC9766 if SND_SOC_AC97_BUS + select SND_SOC_TAS5086 if I2C select SND_SOC_TLV320AIC23 if I2C select SND_SOC_TLV320AIC26 if SPI_MASTER select SND_SOC_TLV320AIC32X4 if I2C @@ -324,6 +325,9 @@ config SND_SOC_STA529 config SND_SOC_STAC9766 tristate +config SND_SOC_TAS5086 + tristate + config SND_SOC_TLV320AIC23 tristate |
