Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755285Ab0AZXwB (ORCPT ); Tue, 26 Jan 2010 18:52:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754768Ab0AZXoA (ORCPT ); Tue, 26 Jan 2010 18:44:00 -0500 Received: from kroah.org ([198.145.64.141]:35416 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754692Ab0AZXn7 (ORCPT ); Tue, 26 Jan 2010 18:43:59 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jan 26 15:39:29 2010 Message-Id: <20100126233929.539417204@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 26 Jan 2010 15:34:32 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Takashi Iwai Subject: [66/98] ALSA: hda - Add missing Line-Out and PCM switches as slave In-Reply-To: <20100126233950.GA5372@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1003 Lines: 36 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Takashi Iwai commit 23033b2bce4361f2859ee0331f97c9056dae7091 upstream. Realtek codecs may have "PCM" and "Line-Out" playback switches, and they can be slaves for vmaster. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2401,6 +2401,8 @@ static const char *alc_slave_sws[] = { "Speaker Playback Switch", "Mono Playback Switch", "IEC958 Playback Switch", + "Line-Out Playback Switch", + "PCM Playback Switch", NULL, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/