Merge branch 'for-2.6.35' into for-2.6.36

This commit is contained in:
Mark Brown 2010-07-20 09:52:25 +01:00
commit 3b89b22358

View file

@ -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