diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:52:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:52:43 -0400 |
| commit | 37cfa1950e2a24d9fa4a593186645d8e2b5042a8 (patch) | |
| tree | 9d8c9485850ba506f6cdea15bff83652d6b6ca28 /sound/soc/codecs/Kconfig | |
| parent | 29e02cb3ffda6ef48a50fea880f63ac8178308bb (diff) | |
| parent | 25cbf465207e9616e9b7d362ee166abf296d4c1e (diff) | |
Merge branch 'wm8974-upstream' 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 910b9162cbbb..167a5ce06cdf 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -46,6 +46,7 @@ config SND_SOC_ALL_CODECS | |||
| 46 | select SND_SOC_WM8960 if I2C | 46 | select SND_SOC_WM8960 if I2C |
| 47 | select SND_SOC_WM8961 if I2C | 47 | select SND_SOC_WM8961 if I2C |
| 48 | select SND_SOC_WM8971 if I2C | 48 | select SND_SOC_WM8971 if I2C |
| 49 | select SND_SOC_WM8974 if I2C | ||
| 49 | select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI | 50 | select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI |
| 50 | select SND_SOC_WM8990 if I2C | 51 | select SND_SOC_WM8990 if I2C |
| 51 | select SND_SOC_WM8993 if I2C | 52 | select SND_SOC_WM8993 if I2C |
| @@ -188,6 +189,9 @@ config SND_SOC_WM8961 | |||
| 188 | config SND_SOC_WM8971 | 189 | config SND_SOC_WM8971 |
| 189 | tristate | 190 | tristate |
| 190 | 191 | ||
| 192 | config SND_SOC_WM8974 | ||
| 193 | tristate | ||
| 194 | |||
| 191 | config SND_SOC_WM8988 | 195 | config SND_SOC_WM8988 |
| 192 | tristate | 196 | tristate |
| 193 | 197 | ||