1 files changed, 46 insertions, 46 deletions

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 5ceb8dd5cb38..9b7fd564343e 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -316,30 +316,30 @@ static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
 }
 
 static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Switch", 0),
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Switch", 1),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Switch", 2),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Switch", 3),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Switch", 4),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Switch", 5),
-        EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Switch", 6),
-        EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Switch", 7),
-        EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Switch", 8),
-        EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Switch", 9),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Switch", 0xa),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Switch", 0xb),
-        EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Switch", 0xc),
-        EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Switch", 0xd),
-        EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Switch", 0xe),
-        EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Switch", 0xf),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Switch", 0x10),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Switch", 0x11),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Switch", 0x12),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Switch", 0x13),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Switch", 0x14),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Switch", 0x15),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Switch", 0x16),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Switch", 0x17),
+        EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),
+        EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),
+        EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),
+        EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),
+        EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),
+        EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),
+        EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Enum", 6),
+        EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Enum", 7),
+        EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Enum", 8),
+        EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Enum", 9),
+        EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 0xa),
+        EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 0xb),
+        EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Enum", 0xc),
+        EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Enum", 0xd),
+        EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Enum", 0xe),
+        EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Enum", 0xf),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Enum", 0x10),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Enum", 0x11),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Enum", 0x12),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Enum", 0x13),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Enum", 0x14),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Enum", 0x15),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Enum", 0x16),
+        EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Enum", 0x17),
 };
 
 #define EMU1010_SOURCE_INPUT(xname,chid) \
@@ -353,28 +353,28 @@ static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
 }
 
 static struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] __devinitdata = {
-        EMU1010_SOURCE_INPUT("DSP 0 Capture Switch", 0),
-        EMU1010_SOURCE_INPUT("DSP 1 Capture Switch", 1),
-        EMU1010_SOURCE_INPUT("DSP 2 Capture Switch", 2),
-        EMU1010_SOURCE_INPUT("DSP 3 Capture Switch", 3),
-        EMU1010_SOURCE_INPUT("DSP 4 Capture Switch", 4),
-        EMU1010_SOURCE_INPUT("DSP 5 Capture Switch", 5),
-        EMU1010_SOURCE_INPUT("DSP 6 Capture Switch", 6),
-        EMU1010_SOURCE_INPUT("DSP 7 Capture Switch", 7),
-        EMU1010_SOURCE_INPUT("DSP 8 Capture Switch", 8),
-        EMU1010_SOURCE_INPUT("DSP 9 Capture Switch", 9),
-        EMU1010_SOURCE_INPUT("DSP A Capture Switch", 0xa),
-        EMU1010_SOURCE_INPUT("DSP B Capture Switch", 0xb),
-        EMU1010_SOURCE_INPUT("DSP C Capture Switch", 0xc),
-        EMU1010_SOURCE_INPUT("DSP D Capture Switch", 0xd),
-        EMU1010_SOURCE_INPUT("DSP E Capture Switch", 0xe),
-        EMU1010_SOURCE_INPUT("DSP F Capture Switch", 0xf),
-        EMU1010_SOURCE_INPUT("DSP 10 Capture Switch", 0x10),
-        EMU1010_SOURCE_INPUT("DSP 11 Capture Switch", 0x11),
-        EMU1010_SOURCE_INPUT("DSP 12 Capture Switch", 0x12),
-        EMU1010_SOURCE_INPUT("DSP 13 Capture Switch", 0x13),
-        EMU1010_SOURCE_INPUT("DSP 14 Capture Switch", 0x14),
-        EMU1010_SOURCE_INPUT("DSP 15 Capture Switch", 0x15),
+        EMU1010_SOURCE_INPUT("DSP 0 Capture Enum", 0),
+        EMU1010_SOURCE_INPUT("DSP 1 Capture Enum", 1),
+        EMU1010_SOURCE_INPUT("DSP 2 Capture Enum", 2),
+        EMU1010_SOURCE_INPUT("DSP 3 Capture Enum", 3),
+        EMU1010_SOURCE_INPUT("DSP 4 Capture Enum", 4),
+        EMU1010_SOURCE_INPUT("DSP 5 Capture Enum", 5),
+        EMU1010_SOURCE_INPUT("DSP 6 Capture Enum", 6),
+        EMU1010_SOURCE_INPUT("DSP 7 Capture Enum", 7),
+        EMU1010_SOURCE_INPUT("DSP 8 Capture Enum", 8),
+        EMU1010_SOURCE_INPUT("DSP 9 Capture Enum", 9),
+        EMU1010_SOURCE_INPUT("DSP A Capture Enum", 0xa),
+        EMU1010_SOURCE_INPUT("DSP B Capture Enum", 0xb),
+        EMU1010_SOURCE_INPUT("DSP C Capture Enum", 0xc),
+        EMU1010_SOURCE_INPUT("DSP D Capture Enum", 0xd),
+        EMU1010_SOURCE_INPUT("DSP E Capture Enum", 0xe),
+        EMU1010_SOURCE_INPUT("DSP F Capture Enum", 0xf),
+        EMU1010_SOURCE_INPUT("DSP 10 Capture Enum", 0x10),
+        EMU1010_SOURCE_INPUT("DSP 11 Capture Enum", 0x11),
+        EMU1010_SOURCE_INPUT("DSP 12 Capture Enum", 0x12),
+        EMU1010_SOURCE_INPUT("DSP 13 Capture Enum", 0x13),
+        EMU1010_SOURCE_INPUT("DSP 14 Capture Enum", 0x14),
+        EMU1010_SOURCE_INPUT("DSP 15 Capture Enum", 0x15),
 };