diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 02:00:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 02:00:13 -0400 |
| commit | bb3784ae36e3a816696ae1f5e8490eeedef3c5cf (patch) | |
| tree | 90484d199022de79cf25547ace6164435f86a28f /sound/soc/Kconfig | |
| parent | 18d4ed4342c14ebeebe60d267b171053efcdfa87 (diff) | |
| parent | 0671da189c1d75eec5f6aba786d57d25209dd2bc (diff) | |
Merge branch 'regmap-asoc' into for-3.2
Diffstat (limited to 'sound/soc/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 2 |
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 | |||
| 7 | select SND_PCM | 7 | select SND_PCM |
| 8 | select AC97_BUS if SND_SOC_AC97_BUS | 8 | select AC97_BUS if SND_SOC_AC97_BUS |
| 9 | select SND_JACK if INPUT=y || INPUT=SND | 9 | select SND_JACK if INPUT=y || INPUT=SND |
| 10 | select REGMAP_I2C if I2C | ||
| 11 | select REGMAP_SPI if SPI_MASTER | ||
| 10 | ---help--- | 12 | ---help--- |
| 11 | 13 | ||
| 12 | If you want ASoC support, you should say Y here and also to the | 14 | If you want ASoC support, you should say Y here and also to the |