diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 05:39:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 05:39:09 -0400 |
| commit | 0933994df77607a07bfe3b562d66900175b8774e (patch) | |
| tree | 281598975855d8ab88b7d9cd082a80b533f70d8d /sound/soc/samsung | |
| parent | 78a262c87157bc049a1b08faf4762c606b24fed9 (diff) | |
| parent | ee1a4d4b7fcfce31dade9f2ad333b34159cee799 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index b99091fc34eb..65f980ef2870 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
| @@ -185,6 +185,7 @@ config SND_SOC_SPEYSIDE | |||
| 185 | select SND_SAMSUNG_I2S | 185 | select SND_SAMSUNG_I2S |
| 186 | select SND_SOC_WM8996 | 186 | select SND_SOC_WM8996 |
| 187 | select SND_SOC_WM9081 | 187 | select SND_SOC_WM9081 |
| 188 | select SND_SOC_WM1250_EV1 | ||
| 188 | 189 | ||
| 189 | config SND_SOC_SPEYSIDE_WM8962 | 190 | config SND_SOC_SPEYSIDE_WM8962 |
| 190 | tristate "Audio support for Wolfson Speyside with WM8962" | 191 | tristate "Audio support for Wolfson Speyside with WM8962" |