diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
| commit | 315472d5abca4d4db90ba654fd616b9a694c80cf (patch) | |
| tree | 27510f454328dd1fac3d3855ceac44edf1bc71d8 /sound/soc/davinci | |
| parent | 56b3f31fb384124790279ad39eb02ee66df4b9fd (diff) | |
| parent | e2e8bfdf61573c98162d1112b971d8d00f00fcf8 (diff) | |
| download | op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.zip op-kernel-dev-315472d5abca4d4db90ba654fd616b9a694c80cf.tar.gz | |
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 d55e647..484b22c 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"}, |
