aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-20 09:52:25 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-20 09:52:25 +0100
commit3b89b223586000d361e96c88fbfd68ef5c5ad880 (patch)
tree9bad489029a59cf47031a469076d2d53e06f3e9a /sound/soc/codecs/Kconfig
parenta3257ba869003ad10f292fea64bf31e2d3e2afff (diff)
parent41f9a314af9c1f24b595f73ae73ee23db6d5e6a8 (diff)
downloadmrst-s0i3-test-3b89b223586000d361e96c88fbfd68ef5c5ad880.tar.gz
mrst-s0i3-test-3b89b223586000d361e96c88fbfd68ef5c5ad880.tar.xz
mrst-s0i3-test-3b89b223586000d361e96c88fbfd68ef5c5ad880.zip
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ea1f5edde3d..55bc2beffb3 100644
--- 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