diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-21 04:54:21 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-21 04:54:21 -0700 |
| commit | e0274b0a300e58cad19ab347566c68762bb22d2c (patch) | |
| tree | 01f454f10fe5ad3525b06d2f1fc9319157012d9d /sound/soc/codecs/Kconfig | |
| parent | d62ab3589462d406e98731799361f46095467882 (diff) | |
| parent | b5ab887e6dfa12c32ef39827da47d5d021320a3f (diff) | |
Merge branch 'upstream/wm8711' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index a2bb659ec18..3c46f34928e 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -37,6 +37,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8523 if I2C select SND_SOC_WM8580 if I2C + select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI @@ -164,6 +165,9 @@ config SND_SOC_WM8523 config SND_SOC_WM8580 tristate +config SND_SOC_WM8711 + tristate + config SND_SOC_WM8728 tristate |