diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:44 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:44 +0200 |
commit | 60b1ae0cd469825e4db0837f5f19c3a8084300c3 (patch) | |
tree | 563aafa40012d1bb8218987ffeb76c88743e18e5 /sound/soc/samsung/Kconfig | |
parent | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (diff) | |
parent | 8c285645ab3b05942124020b5f0b89d3b539823a (diff) |
Merge branch 'fix/asoc' into for-linus
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 |