Merge branch 'asoc-fixes' into for-linus

+2 -2
+2 -2
sound/soc/codecs/wm8753.c
··· 583 583 584 584 /* out 4 */ 585 585 {"Out4 Mux", "VREF", "VREF"}, 586 - {"Out4 Mux", "Capture ST", "Capture ST Mixer"}, 586 + {"Out4 Mux", "Capture ST", "Playback Mixer"}, 587 587 {"Out4 Mux", "LOUT2", "LOUT2"}, 588 588 {"Out 4", NULL, "Out4 Mux"}, 589 589 {"OUT4", NULL, "Out 4"}, ··· 607 607 /* Capture Right Mux */ 608 608 {"Capture Right Mux", "PGA", "Right Capture Volume"}, 609 609 {"Capture Right Mux", "Line or RXP-RXN", "Line Right Mux"}, 610 - {"Capture Right Mux", "Sidetone", "Capture ST Mixer"}, 610 + {"Capture Right Mux", "Sidetone", "Playback Mixer"}, 611 611 612 612 /* Mono Capture mixer-mux */ 613 613 {"Capture Right Mixer", "Stereo", "Capture Right Mux"},