From 5bfde8cea65d1dba59fee52e4472022be24cb5d6 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 17 May 2011 09:17:52 +0200 Subject: [PATCH] --- yaml --- r: 248480 b: refs/heads/master c: a3a85d3983f7e18c46fba9f92c21d8a713de9791 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_conexant.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ff691406078a..1758c832110a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47ad1f4e40c4374243a56c8df168f4fb551c7915 +refs/heads/master: a3a85d3983f7e18c46fba9f92c21d8a713de9791 diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c index 390bc02dcf58..703dda69ad7c 100644 --- a/trunk/sound/pci/hda/patch_conexant.c +++ b/trunk/sound/pci/hda/patch_conexant.c @@ -475,12 +475,18 @@ static const struct snd_kcontrol_new cxt_beep_mixer[] = { static const char * const slave_vols[] = { "Headphone Playback Volume", "Speaker Playback Volume", + "Front Playback Volume", + "Surround Playback Volume", + "CLFE Playback Volume", NULL }; static const char * const slave_sws[] = { "Headphone Playback Switch", "Speaker Playback Switch", + "Front Playback Switch", + "Surround Playback Switch", + "CLFE Playback Switch", NULL };