diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 13:54:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 13:54:06 -0400 |
| commit | 2c9ee33d37a6f3808c4319f0849671fafa8a6f4c (patch) | |
| tree | 2047f0a8460d7df8d9c96e6924be0bc97ae5d403 /sound/soc/codecs/wm8753.c | |
| parent | 766df6d98f9c28dfc6f72c23a010819719e4c3e0 (diff) | |
| parent | 539d3d8cbe5cf7597d4c4c4428aec242f9ea5185 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/wm8753.c')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index f60f3a02d1f8..9b27efb052fe 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
| @@ -595,6 +595,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 595 | 595 | ||
| 596 | /* Mono Capture mixer-mux */ | 596 | /* Mono Capture mixer-mux */ |
| 597 | {"Capture Right Mixer", "Stereo", "Capture Right Mux"}, | 597 | {"Capture Right Mixer", "Stereo", "Capture Right Mux"}, |
| 598 | {"Capture Left Mixer", "Stereo", "Capture Left Mux"}, | ||
| 598 | {"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"}, | 599 | {"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"}, |
| 599 | {"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"}, | 600 | {"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"}, |
| 600 | {"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"}, | 601 | {"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"}, |