diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-18 23:35:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-18 23:35:59 -0500 |
commit | a32eb702f8a9e0efe18a032168c1886782f79da9 (patch) | |
tree | a8b59de41b84d0515d705a4cf08ee6b6bd007cda /sound/soc/codecs/Kconfig | |
parent | e479d85ced01ea7f85c7dd21dc858af25f1493b4 (diff) | |
parent | 0c2d6964562835501280409cac5d4ee28e07e8c2 (diff) |
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-adau1977
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r-- | sound/soc/codecs/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index a6afdf5004cb..9ea428bdd872 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
@@ -22,7 +22,8 @@ config SND_SOC_ALL_CODECS | |||
22 | select SND_SOC_AD1980 if SND_SOC_AC97_BUS | 22 | select SND_SOC_AD1980 if SND_SOC_AC97_BUS |
23 | select SND_SOC_AD73311 | 23 | select SND_SOC_AD73311 |
24 | select SND_SOC_ADAU1373 if I2C | 24 | select SND_SOC_ADAU1373 if I2C |
25 | select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI | 25 | select SND_SOC_ADAV801 if SPI_MASTER |
26 | select SND_SOC_ADAV803 if I2C | ||
26 | select SND_SOC_ADAU1701 if I2C | 27 | select SND_SOC_ADAU1701 if I2C |
27 | select SND_SOC_ADS117X | 28 | select SND_SOC_ADS117X |
28 | select SND_SOC_AK4104 if SPI_MASTER | 29 | select SND_SOC_AK4104 if SPI_MASTER |
@@ -202,6 +203,14 @@ config SND_SOC_ADAU1373 | |||
202 | config SND_SOC_ADAV80X | 203 | config SND_SOC_ADAV80X |
203 | tristate | 204 | tristate |
204 | 205 | ||
206 | config SND_SOC_ADAV801 | ||
207 | tristate | ||
208 | select SND_SOC_ADAV80X | ||
209 | |||
210 | config SND_SOC_ADAV803 | ||
211 | tristate | ||
212 | select SND_SOC_ADAV80X | ||
213 | |||
205 | config SND_SOC_ADS117X | 214 | config SND_SOC_ADS117X |
206 | tristate | 215 | tristate |
207 | 216 | ||