diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:18 +0100 |
| commit | c44ddeb8370d3b528e2b8287c18e14acb81ee1a8 (patch) | |
| tree | 45edfbd4d8d80324afb7b0408f4813250fbe8471 /sound/soc/codecs/Kconfig | |
| parent | 684d8c515c1123f34363bccc96d4148bdd58c5ed (diff) | |
| parent | 200ceb962f7b00815259bf3cb2df5a0ac15eb99d (diff) | |
| download | linux-stable-c44ddeb8370d3b528e2b8287c18e14acb81ee1a8.tar.gz linux-stable-c44ddeb8370d3b528e2b8287c18e14acb81ee1a8.tar.bz2 linux-stable-c44ddeb8370d3b528e2b8287c18e14acb81ee1a8.zip | |
Merge remote-tracking branch 'asoc/topic/dfmbcs320' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 5841674b6993..0158b05f8cc2 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -40,7 +40,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA7213 if I2C select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C - select SND_SOC_DFBMCS320 + select SND_SOC_BT_SCO select SND_SOC_ISABELLE if I2C select SND_SOC_JZ4740_CODEC select SND_SOC_LM4857 if I2C @@ -263,7 +263,7 @@ config SND_SOC_DA732X config SND_SOC_DA9055 tristate -config SND_SOC_DFBMCS320 +config SND_SOC_BT_SCO tristate config SND_SOC_DMIC |