diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/codecs/wm8904.c | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 4c9fb142cb2..91dfbfeda6f 100644 --- 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" |