From 8c61f8714b49be006661db5a8ef15a3611c0bedb Mon Sep 17 00:00:00 2001 From: "Ujfalusi, Peter" Date: Fri, 30 Sep 2011 11:39:50 +0300 Subject: [PATCH] --- yaml --- r: 270709 b: refs/heads/master c: 5382ffbb179459b81b36ef47e58b84e3e1eff862 h: refs/heads/master i: 270707: ce3ac40a4a4adde9283a386d59b691f2009919fe v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/sdp4430.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 10cd79def606..2f20f0d8f830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad51f765447f55699e3280086b32502f9a391345 +refs/heads/master: 5382ffbb179459b81b36ef47e58b84e3e1eff862 diff --git a/trunk/sound/soc/omap/sdp4430.c b/trunk/sound/soc/omap/sdp4430.c index 249d84b705fc..79ec76d521e1 100644 --- a/trunk/sound/soc/omap/sdp4430.c +++ b/trunk/sound/soc/omap/sdp4430.c @@ -88,7 +88,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = { SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_HP("Headset Stereophone", NULL), SND_SOC_DAPM_SPK("Earphone Spk", NULL), - SND_SOC_DAPM_INPUT("Aux/FM Stereo In"), + SND_SOC_DAPM_INPUT("FM Stereo In"), }; static const struct snd_soc_dapm_route audio_map[] = { @@ -113,8 +113,8 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Earphone Spk", NULL, "EP"}, /* Aux/FM Stereo In: AFML, AFMR */ - {"AFML", NULL, "Aux/FM Stereo In"}, - {"AFMR", NULL, "Aux/FM Stereo In"}, + {"AFML", NULL, "FM Stereo In"}, + {"AFMR", NULL, "FM Stereo In"}, }; static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)