diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:10 +0100 |
| commit | 27e9a69759b475200653ad16ef1e7dde5ee1cf56 (patch) | |
| tree | 458432bb0c7e05568e082159d14685320483cb41 | |
| parent | Linux 3.10-rc6 (diff) | |
| parent | ASoC: adav80x: Select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI (diff) | |
| download | linux-dev-27e9a69759b475200653ad16ef1e7dde5ee1cf56.tar.xz linux-dev-27e9a69759b475200653ad16ef1e7dde5ee1cf56.zip | |
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 select SND_SOC_AD1980 if SND_SOC_AC97_BUS select SND_SOC_AD73311 select SND_SOC_ADAU1373 if I2C - select SND_SOC_ADAV80X + select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI select SND_SOC_ADS117X select SND_SOC_AK4104 if SPI_MASTER select SND_SOC_AK4535 if I2C |