diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-02 12:50:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-02 12:50:50 +0200 |
| commit | 591d8a25c7c242f6b00be120ed378e585a5afb47 (patch) | |
| tree | 62d2c80c0ab54dd4b1d2d0701ccb0be2ef9013c5 | |
| parent | 030b655b062fe5190fc490e0091ea50307d7a86f (diff) | |
| parent | 4037314afc6eea3eab7e0447884c12b57a081f63 (diff) | |
| download | kernel_samsung_smdk4412-591d8a25c7c242f6b00be120ed378e585a5afb47.zip kernel_samsung_smdk4412-591d8a25c7c242f6b00be120ed378e585a5afb47.tar.gz kernel_samsung_smdk4412-591d8a25c7c242f6b00be120ed378e585a5afb47.tar.bz2 | |
Merge branch 'asoc-fixes' into for-linus
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 5761164..e873414 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -583,7 +583,7 @@ static const struct snd_soc_dapm_route audio_map[] = { /* out 4 */ {"Out4 Mux", "VREF", "VREF"}, - {"Out4 Mux", "Capture ST", "Capture ST Mixer"}, + {"Out4 Mux", "Capture ST", "Playback Mixer"}, {"Out4 Mux", "LOUT2", "LOUT2"}, {"Out 4", NULL, "Out4 Mux"}, {"OUT4", NULL, "Out 4"}, @@ -607,7 +607,7 @@ static const struct snd_soc_dapm_route audio_map[] = { /* Capture Right Mux */ {"Capture Right Mux", "PGA", "Right Capture Volume"}, {"Capture Right Mux", "Line or RXP-RXN", "Line Right Mux"}, - {"Capture Right Mux", "Sidetone", "Capture ST Mixer"}, + {"Capture Right Mux", "Sidetone", "Playback Mixer"}, /* Mono Capture mixer-mux */ {"Capture Right Mixer", "Stereo", "Capture Right Mux"}, |