From: Mark Brown <broonie@linaro.org>
Date: Sun, 23 Mar 2014 14:00:55 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=980aac20877e428406959391e6cb6b8dc3243ad2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next
---

980aac20877e428406959391e6cb6b8dc3243ad2
diff --cc sound/soc/codecs/max98090.c
index 96a47459b3d7,361862d4fa65,51f9b3d16b41..98c6e104357c
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@ -872,7 -871,7 -859,8 +872,7 @@@@ static const struct snd_kcontrol_new ma
   
   static const char *dmic_mux_text[] = { "ADC", "DMIC" };
   
 - static SOC_ENUM_SINGLE_EXT_DECL(dmic_mux_enum, dmic_mux_text);
  -static const struct soc_enum dmic_mux_enum =
  -	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dmic_mux_text), dmic_mux_text);
 ++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);