From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765769AbZD3RVW (ORCPT ); Thu, 30 Apr 2009 13:21:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764604AbZD3RHs (ORCPT ); Thu, 30 Apr 2009 13:07:48 -0400 Received: from kroah.org ([198.145.64.141]:56384 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764544AbZD3RHk (ORCPT ); Thu, 30 Apr 2009 13:07:40 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu Apr 30 09:57:43 2009 Message-Id: <20090430165742.913310552@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 30 Apr 2009 09:56:20 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Akinobu Mita , Takashi Iwai , Chris Wright Subject: [patch 31/88] ALSA: hda - add missing comma in ad1884_slave_vols References: <20090430165549.117010404@mini.kroah.org> Content-Disposition: inline; filename=0050-ALSA-hda-add-missing-comma-in-ad1884_slave_vols.patch In-Reply-To: <20090430170122.GA16015@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Akinobu Mita upstream commit: bca68467b59a24396554d8dd5979ee363c174854 Signed-off-by: Akinobu Mita Signed-off-by: Takashi Iwai Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_analog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -3233,7 +3233,7 @@ static const char *ad1884_slave_vols[] = "Mic Playback Volume", "CD Playback Volume", "Internal Mic Playback Volume", - "Docking Mic Playback Volume" + "Docking Mic Playback Volume", "Beep Playback Volume", "IEC958 Playback Volume", NULL