diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:29:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:29:00 +0100 |
| commit | 16f135f08f73b90e8c3a57309a1d90cecfc79481 (patch) | |
| tree | 248b5747c3665017b1484ccfe968846995dd8514 /sound/soc | |
| parent | 1179ace13e9e8956bf403c89117338c67e7a4c82 (diff) | |
| parent | e94a093c1c7a1b06fa574c99f69ed594e0c52ff2 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8904' into asoc-next
Diffstat (limited to 'sound/soc')
| -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" |