diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 16:08:51 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 16:08:51 +0900 |
commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /sound/soc/samsung/Kconfig | |
parent | 9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c (diff) | |
parent | 21d41f2b312231536cf981c960c83cc4493c0293 (diff) | |
download | linux-stable-b9a3acf46afdafc601947136f63e9dd228cd86e8.tar.gz linux-stable-b9a3acf46afdafc601947136f63e9dd228cd86e8.tar.bz2 linux-stable-b9a3acf46afdafc601947136f63e9dd228cd86e8.zip |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'sound/soc/samsung/Kconfig')
-rw-r--r-- | sound/soc/samsung/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 54b0e4b7faf7..b99091fc34eb 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -183,7 +183,7 @@ config SND_SOC_SPEYSIDE tristate "Audio support for Wolfson Speyside" depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 select SND_SAMSUNG_I2S - select SND_SOC_WM8915 + select SND_SOC_WM8996 select SND_SOC_WM9081 config SND_SOC_SPEYSIDE_WM8962 |