diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-20 10:52:25 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-20 10:52:25 +0200 |
| commit | 3b89b223586000d361e96c88fbfd68ef5c5ad880 (patch) | |
| tree | 9bad489029a59cf47031a469076d2d53e06f3e9a /sound/soc | |
| parent | ASoC: Implement WM8994 AIF1ADC2 paths (diff) | |
| parent | ASoC: Select wm_hubs automatically for WM8994 (diff) | |
| download | linux-3b89b223586000d361e96c88fbfd68ef5c5ad880.tar.xz linux-3b89b223586000d361e96c88fbfd68ef5c5ad880.zip | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound/soc')
| -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 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 |