---

yaml --- r: 47139 b: refs/heads/master c: eb41dab h: refs/heads/master i: 47137: 9bffabc 47135: b1213fa v: v3
git-mirror · Feb 9, 2007 · d193fe5 · d193fe5
1 parent cf4a1e1
commit d193fe5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 184c1e2c4c4221c2b8d1e16c33314595373fa73f
+refs/heads/master: eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9
diff --git a/trunk/sound/pci/emu10k1/emumixer.c b/trunk/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[] = {