Merge branch 'for-2.6.32' into for-2.6.33
This commit is contained in:
@@ -595,6 +595,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
||||
|
||||
/* Mono Capture mixer-mux */
|
||||
{"Capture Right Mixer", "Stereo", "Capture Right Mux"},
|
||||
{"Capture Left Mixer", "Stereo", "Capture Left Mux"},
|
||||
{"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"},
|
||||
{"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"},
|
||||
{"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"},
|
||||
|
Reference in New Issue
Block a user