summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-17 16:20:10 (GMT)
committerMark Brown <broonie@linaro.org>2013-06-17 16:20:10 (GMT)
commit27e9a69759b475200653ad16ef1e7dde5ee1cf56 (patch)
tree458432bb0c7e05568e082159d14685320483cb41 /sound/soc
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
parent4119c0c0c6e4508236672c3ec714da25eed783ce (diff)
downloadlinux-27e9a69759b475200653ad16ef1e7dde5ee1cf56.tar.xz
Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 2f45f00..5841674 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