diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 12:06:46 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 12:06:46 +0100 |
commit | 315472d5abca4d4db90ba654fd616b9a694c80cf (patch) | |
tree | 27510f454328dd1fac3d3855ceac44edf1bc71d8 /sound/soc/davinci | |
parent | Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next (diff) | |
parent | ASoC: tlv320aic3x: Convert mic bias to a supply widget (diff) | |
download | linux-315472d5abca4d4db90ba654fd616b9a694c80cf.tar.xz linux-315472d5abca4d4db90ba654fd616b9a694c80cf.zip |
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r-- | sound/soc/davinci/davinci-evm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index d55e6477bff0..484b22c5df5d 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -116,9 +116,9 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Line Out", NULL, "RLOUT"}, /* Mic connected to (MIC3L | MIC3R) */ - {"MIC3L", NULL, "Mic Bias 2V"}, - {"MIC3R", NULL, "Mic Bias 2V"}, - {"Mic Bias 2V", NULL, "Mic Jack"}, + {"MIC3L", NULL, "Mic Bias"}, + {"MIC3R", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "Mic Jack"}, /* Line In connected to (LINE1L | LINE2L), (LINE1R | LINE2R) */ {"LINE1L", NULL, "Line In"}, |