diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-20 04:52:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-20 04:52:25 -0400 |
| commit | 3b89b223586000d361e96c88fbfd68ef5c5ad880 (patch) | |
| tree | 9bad489029a59cf47031a469076d2d53e06f3e9a /sound | |
| parent | a3257ba869003ad10f292fea64bf31e2d3e2afff (diff) | |
| parent | 41f9a314af9c1f24b595f73ae73ee23db6d5e6a8 (diff) | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index ea1f5edde3d6..55bc2beffb3a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -85,8 +85,8 @@ config SND_SOC_ALL_CODECS | |||
| 85 | 85 | ||
| 86 | config SND_SOC_WM_HUBS | 86 | config SND_SOC_WM_HUBS |
| 87 | tristate | 87 | tristate |
| 88 | default y if SND_SOC_WM8993=y | 88 | default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y |
| 89 | default m if SND_SOC_WM8993=m | 89 | default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m |
| 90 | 90 | ||
| 91 | config SND_SOC_AC97_CODEC | 91 | config SND_SOC_AC97_CODEC |
| 92 | tristate | 92 | tristate |