Merge branch 'for-2.6.35' into for-2.6.36

3b89b223 · Mark Brown · a3257ba8 · 41f9a314 · 3b89b223
Commit 3b89b223 authored Jul 20, 2010 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/codecs/Kconfig sound/soc/codecs/Kconfig +2 -2

No files found.
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -85,8 +85,8 @@ config SND_SOC_ALL_CODECS

 config SND_SOC_WM_HUBS
 	tristate
-	default y if SND_SOC_WM8993=y
-	default m if SND_SOC_WM8993=m
+	default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
+	default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m

 config SND_SOC_AC97_CODEC
 	tristate