diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 14:45:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 14:45:52 +0200 |
| commit | 5d8cf7688ede7128ebdad8741ed5bdea0f2cd637 (patch) | |
| tree | 19ee8dc86b12d9c8c3f2b237ce9a62bcded37b2b /sound/soc/codecs/Kconfig | |
| parent | Merge remote-tracking branch 'asoc/topic/rt298' into asoc-next (diff) | |
| parent | ASoC: tidyup alphabetical order for SND_SOC_Bxx (diff) | |
| download | linux-5d8cf7688ede7128ebdad8741ed5bdea0f2cd637.tar.xz linux-5d8cf7688ede7128ebdad8741ed5bdea0f2cd637.zip | |
Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 03242a4dc5a8..75f571289154 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -43,6 +43,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_AK5386 select SND_SOC_ALC5623 if I2C select SND_SOC_ALC5632 if I2C + select SND_SOC_BT_SCO select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC select SND_SOC_CS35L32 if I2C select SND_SOC_CS42L51_I2C if I2C @@ -64,7 +65,6 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C select SND_SOC_DMIC - select SND_SOC_BT_SCO select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_ES8328_I2C if I2C select SND_SOC_GTM601 @@ -370,6 +370,9 @@ config SND_SOC_ALC5623 config SND_SOC_ALC5632 tristate +config SND_SOC_BT_SCO + tristate + config SND_SOC_CQ0093VC tristate @@ -476,9 +479,6 @@ config SND_SOC_DA732X config SND_SOC_DA9055 tristate -config SND_SOC_BT_SCO - tristate - config SND_SOC_DMIC tristate |