From d193fe575ac11917b0daf817395dd8f8729759cf Mon Sep 17 00:00:00 2001
From: James Courtier-Dutton <James@superbug.co.uk>
Date: Wed, 6 Dec 2006 20:38:45 +0000
Subject: [PATCH] --- yaml --- r: 47139 b: refs/heads/master c:
 eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9 h: refs/heads/master i:   47137:
 9bffabcd40cd3638946f625234c3868c6ce79c40   47135:
 b1213fa5705cf32385e201615d892c5975a511d5 v: v3

---
 [refs]                             | 2 +-
 trunk/sound/pci/emu10k1/emumixer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0e9a8e681a4b..a369cc035664 100644
--- 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
index b8221f385ff9..0469546fc333 100644
--- 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[] = {