aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-02 12:44:55 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-02 12:44:55 -0500
commit33e57f221a333efa55786f4c3610c7c82b358808 (patch)
tree1e093456dc7cb745249fe5d2da2ef582e6aab4f0
parent8f103167fecb1f4b5888fbcfc81b67e3c810dee0 (diff)
parent87b86ade8bb07473596e2551de7bb64c1f44bbe4 (diff)
Merge branch 'for-3.2' into for-3.3
-rw-r--r--sound/soc/codecs/wm8994.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 83e8033f5719..02ca2573214d 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1465,15 +1465,15 @@ SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
1465}; 1465};
1466 1466
1467static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = { 1467static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
1468SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux, 1468SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
1469 adc_mux_ev, SND_SOC_DAPM_PRE_PMU), 1469 adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
1470SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux, 1470SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
1471 adc_mux_ev, SND_SOC_DAPM_PRE_PMU), 1471 adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
1472}; 1472};
1473 1473
1474static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = { 1474static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
1475SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux), 1475SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
1476SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux), 1476SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
1477}; 1477};
1478 1478
1479static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = { 1479static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {