summaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emumixer.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2006-12-06 20:38:45 +0000
committerJaroslav Kysela <perex@suse.cz>2007-02-09 09:02:18 +0100
commiteb41dab6e10332c1c9008f3cfc5b88ff1e392cb9 (patch)
treedd67a2a874644f7688230c5d6fb24a8a097de888 /sound/pci/emu10k1/emumixer.c
parent184c1e2c4c4221c2b8d1e16c33314595373fa73f (diff)
downloadlinux-eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9.tar.gz
linux-eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9.tar.bz2
linux-eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9.zip
[ALSA] emu10k1: Rename the digital optical capture control for the Audigy 2 ZS
Notebook. Digital playback and capture now works, but it is not bit accurate because it passes through a resampler. Bit accurate playback and capture will be implemented later via the p17v. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emumixer.c')
-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 b8221f385ff9..0469546fc333 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1486,6 +1486,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
"Wave Playback Volume", "OLD PCM Playback Volume",
"Wave Master Playback Volume", "Master Playback Volume",
"AMic Playback Volume", "Old Mic Playback Volume",
+ "CD Capture Volume", "IEC958 Optical Capture Volume",
NULL
};
static char *audigy_remove_ctls_i2c_adc[] = {
@@ -1494,6 +1495,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
"Mic Capture Volume",
"Analog Mix Capture Volume",
"Aux Capture Volume",
+ "IEC958 Optical Capture Volume",
NULL
};
static char *audigy_remove_ctls_1361t_adc[] = {