diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
| commit | a7fd051cd1119af788dd161a4c834b06377d76a8 (patch) | |
| tree | 80368fccae171d1b0446f3e2b4fd4d9b43e65cbe /sound/soc/codecs/wm5110.c | |
| parent | 00629ac158e1be3124b796078cf0347b946cb053 (diff) | |
| parent | 1071ea6e68ead40df739b223e9013d99c23c19ab (diff) | |
Merge tag 'v3.10.27' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.27-2014.02
This is the 3.10.27 stable release
Diffstat (limited to 'sound/soc/codecs/wm5110.c')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index cd6ed88409d7..866b9c657e15 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -897,7 +897,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { { "HPOUT2R", NULL, "OUT2R" }, { "HPOUT3L", NULL, "OUT3L" }, - { "HPOUT3R", NULL, "OUT3L" }, + { "HPOUT3R", NULL, "OUT3R" }, { "SPKOUTLN", NULL, "OUT4L" }, { "SPKOUTLP", NULL, "OUT4L" }, |