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

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4c9fb142cb2d21d18ac90dd1b6e0272bf48c7e24..91dfbfeda6f81763c8afff38cc567b93b33bb218 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1012,7 +1012,7 @@ static const struct soc_enum liner_enum =
        SOC_ENUM_SINGLE(WM8904_ANALOGUE_OUT12_ZC, 0, 2, out_mux_text);
 
 static const struct snd_kcontrol_new liner_mux =
-       SOC_DAPM_ENUM("LINEL Mux", liner_enum);
+       SOC_DAPM_ENUM("LINER Mux", liner_enum);
 
 static const char *sidetone_text[] = {
        "None", "Left", "Right"