summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-01-05 18:40:56 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-22 16:23:53 +0100
commit7eae36fbd5ea9db3d3fe0d671199121be782a5b3 (patch)
tree1af1e5a151d1ab6bcd232e65645dbc6167431669 /sound
parent6421776a6f8b8503a88e07b205162842d3f7d702 (diff)
downloadlinux-7eae36fbd5ea9db3d3fe0d671199121be782a5b3.tar.gz
linux-7eae36fbd5ea9db3d3fe0d671199121be782a5b3.tar.bz2
linux-7eae36fbd5ea9db3d3fe0d671199121be782a5b3.zip
[ALSA] 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>
Diffstat (limited to 'sound')
-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 8c912b1bee39..2a9d12d10680 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -759,6 +759,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *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",