diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-22 11:08:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-22 11:08:26 +0100 |
commit | e370f45aeb76634d81a59b3b8f45b0f2faebef9b (patch) | |
tree | cb89c726ee034964bfc7415bc92665e14b4955cc /sound/soc/codecs/Kconfig | |
parent | f274143f127dd9420e6def7dc47340b55f29c885 (diff) | |
parent | 74dc55ed5b709e4a2a538252f98ea62358df82ce (diff) |
Merge branch 'wm8961' into for-2.6.32
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 bbc97fd7664..021dbdfa5b9 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -39,6 +39,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8903 if I2C select SND_SOC_WM8940 if I2C select SND_SOC_WM8960 if I2C + select SND_SOC_WM8961 if I2C select SND_SOC_WM8971 if I2C select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8990 if I2C @@ -156,6 +157,9 @@ config SND_SOC_WM8940 config SND_SOC_WM8960 tristate +config SND_SOC_WM8961 + tristate + config SND_SOC_WM8971 tristate |