diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-19 14:49:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-19 14:49:21 -0400 |
| commit | 5b32f794b3bab4f9cad1290b505450515d4558e9 (patch) | |
| tree | 458432bb0c7e05568e082159d14685320483cb41 | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| parent | 4119c0c0c6e4508236672c3ec714da25eed783ce (diff) | |
Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linus
| -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 2f45f00e31b0..5841674b6993 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -19,7 +19,7 @@ config SND_SOC_ALL_CODECS | |||
| 19 | select SND_SOC_AD1980 if SND_SOC_AC97_BUS | 19 | select SND_SOC_AD1980 if SND_SOC_AC97_BUS |
| 20 | select SND_SOC_AD73311 | 20 | select SND_SOC_AD73311 |
| 21 | select SND_SOC_ADAU1373 if I2C | 21 | select SND_SOC_ADAU1373 if I2C |
| 22 | select SND_SOC_ADAV80X | 22 | select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI |
| 23 | select SND_SOC_ADS117X | 23 | select SND_SOC_ADS117X |
| 24 | select SND_SOC_AK4104 if SPI_MASTER | 24 | select SND_SOC_AK4104 if SPI_MASTER |
| 25 | select SND_SOC_AK4535 if I2C | 25 | select SND_SOC_AK4535 if I2C |