ALSA: emu10k1: remove unused AC'97 mixer controls on Audigy

AC'97 Headphone output and EAPD control aren't used
on Audigy so remove them from mixer.

Also remove AC'97 3D control as the driver is
already doing for Audigys with 1361T ADC.

Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 55e57166256e99fa43d545c23200675c5aeea31b..f1cb7b37c8ec94b66c2e86bc4e27a8fb5448a299 100644 (file)
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1830,10 +1830,16 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                "Capture Switch",
                "Capture Volume",
                "Mic Select",
+               "Headphone Playback Switch",
+               "Headphone Playback Volume",
+               "3D Control - Center",
+               "3D Control - Depth",
+               "3D Control - Switch",
                "Video Playback Switch",
                "Video Playback Volume",
                "Mic Playback Switch",
                "Mic Playback Volume",
+               "External Amplifier",
                NULL
        };
        static char *audigy_rename_ctls[] = {
@@ -1996,11 +2002,6 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");
                rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume");
                rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume");
-               remove_ctl(card, "Headphone Playback Switch");
-               remove_ctl(card, "Headphone Playback Volume");
-               remove_ctl(card, "3D Control - Center");
-               remove_ctl(card, "3D Control - Depth");
-               remove_ctl(card, "3D Control - Switch");
        }
        if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL)
                return -ENOMEM;