aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-02-07 11:33:51 +0000
committerChris Wright <chrisw@sous-sol.org>2006-02-09 23:20:16 -0800
commitb99e3912b097537081a262df58aba77d95526b9a (patch)
tree3ef1910dacd52063d260affc34294dbfa717b61a
parenta426fa9147f034d5355875ffcb91f0a61e5b393a (diff)
downloadlinux-linaro-stable-b99e3912b097537081a262df58aba77d95526b9a.tar.gz
[PATCH] emu10k1 - Fix the confliction of 'Front' control
Modules: EMU10K1/EMU10K2 driver Fix the confliction of 'Front' controls on models with STAC9758 codec. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--sound/pci/emu10k1/emumixer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 7cc831ccd0cb..6c39e7be5884 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -750,6 +750,8 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu,
"Master Mono Playback Volume",
"PCM Out Path & Mute",
"Mono Output Select",
+ "Front Playback Switch",
+ "Front Playback Volume",
"Surround Playback Switch",
"Surround Playback Volume",
"Center Playback Switch",