Merge remote-tracking branch 'asoc/topic/enum' into asoc-next

1 files changed, 2 insertions, 3 deletions

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 57fc4c315033..906534d18d3f 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -877,7 +877,7 @@ static const char *dmic_mux_text[] = { "ADC", "DMIC" };
 static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
 
 static const struct snd_kcontrol_new max98090_dmic_mux =
-        SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);
+        SOC_DAPM_ENUM("DMIC Mux", dmic_mux_enum);
 
 static const char *max98090_micpre_text[] = { "Off", "On" };
 
@@ -1177,8 +1177,7 @@ static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = {
         SND_SOC_DAPM_MUX("MIC2 Mux", SND_SOC_NOPM,
                 0, 0, &max98090_mic2_mux),
 
-        SND_SOC_DAPM_VIRT_MUX("DMIC Mux", SND_SOC_NOPM,
-                0, 0, &max98090_dmic_mux),
+        SND_SOC_DAPM_MUX("DMIC Mux", SND_SOC_NOPM, 0, 0, &max98090_dmic_mux),
 
         SND_SOC_DAPM_PGA_E("MIC1 Input", M98090_REG_MIC1_INPUT_LEVEL,
                 M98090_MIC_PA1EN_SHIFT, 0, NULL, 0, max98090_micinput_event,