diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:47 +0000 |
| commit | efad6eed2698a975ef4c82d97ab7a6279e978fd0 (patch) | |
| tree | 0de9acec6dfa8cddedd358da6d225e682bcb9e3c /sound/soc/omap/omap3pandora.c | |
| parent | b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96 (diff) | |
| parent | 85becda62c77d0951a1079bb45d0b5cbe6012252 (diff) | |
| download | linux-efad6eed2698a975ef4c82d97ab7a6279e978fd0.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/twl' into asoc-next
Diffstat (limited to 'sound/soc/omap/omap3pandora.c')
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 43d950a79ff9..805512f2555a 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -144,11 +144,11 @@ static const struct snd_soc_dapm_route omap3pandora_in_map[] = { {"AUXL", NULL, "Line In"}, {"AUXR", NULL, "Line In"}, - {"MAINMIC", NULL, "Mic Bias 1"}, - {"Mic Bias 1", NULL, "Mic (internal)"}, + {"MAINMIC", NULL, "Mic (internal)"}, + {"Mic (internal)", NULL, "Mic Bias 1"}, - {"SUBMIC", NULL, "Mic Bias 2"}, - {"Mic Bias 2", NULL, "Mic (external)"}, + {"SUBMIC", NULL, "Mic (external)"}, + {"Mic (external)", NULL, "Mic Bias 2"}, }; static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) |