diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:25 +0100 |
| commit | 5d5940d4690d5cd0321256902b2aea8d4c554416 (patch) | |
| tree | bd39a4ef6eaba9b80bcdf37c867b9e23c468480d /sound/soc/codecs | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| parent | 60b6f1a1e578a5f8a245d4b7622ebf2bad7798cb (diff) | |
| download | talos-obmc-linux-5d5940d4690d5cd0321256902b2aea8d4c554416.tar.gz talos-obmc-linux-5d5940d4690d5cd0321256902b2aea8d4c554416.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 45b72561c615..350b86458971 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -324,7 +324,7 @@ config SND_SOC_TLV320AIC23 tristate config SND_SOC_TLV320AIC26 - tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE + tristate depends on SPI config SND_SOC_TLV320AIC32X4 |
