summaryrefslogtreecommitdiffstats
path: root/sound/soc/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 15:00:13 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 15:00:13 +0900
commitbb3784ae36e3a816696ae1f5e8490eeedef3c5cf (patch)
tree90484d199022de79cf25547ace6164435f86a28f /sound/soc/Kconfig
parent18d4ed4342c14ebeebe60d267b171053efcdfa87 (diff)
parent0671da189c1d75eec5f6aba786d57d25209dd2bc (diff)
downloadblackbird-obmc-linux-bb3784ae36e3a816696ae1f5e8490eeedef3c5cf.tar.gz
blackbird-obmc-linux-bb3784ae36e3a816696ae1f5e8490eeedef3c5cf.zip
Merge branch 'regmap-asoc' into for-3.2
Diffstat (limited to 'sound/soc/Kconfig')
-rw-r--r--sound/soc/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 47d07ce4e867..1381db853ef0 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -7,6 +7,8 @@ menuconfig SND_SOC
select SND_PCM
select AC97_BUS if SND_SOC_AC97_BUS
select SND_JACK if INPUT=y || INPUT=SND
+ select REGMAP_I2C if I2C
+ select REGMAP_SPI if SPI_MASTER
---help---
If you want ASoC support, you should say Y here and also to the
OpenPOWER on IntegriCloud