The patch titled
ALSA: ac97: correct some Mic mixer elements
has been removed from the -mm tree. Its filename is
alsa-ac97-correct-some-mic-mixer-elements.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ALSA: ac97: correct some Mic mixer elements
From: Takashi Iwai <tiwai@xxxxxxx>
Revert the mixer element names of some Mic controls to the state of
2.6.17. This should fix the name mismatch in alsactl.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/pci/ac97/ac97_codec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN sound/pci/ac97/ac97_codec.c~alsa-ac97-correct-some-mic-mixer-elements sound/pci/ac97/ac97_codec.c
--- a/sound/pci/ac97/ac97_codec.c~alsa-ac97-correct-some-mic-mixer-elements
+++ a/sound/pci/ac97/ac97_codec.c
@@ -573,7 +573,7 @@ AC97_SINGLE("PC Speaker Playback Volume"
};
static const struct snd_kcontrol_new snd_ac97_controls_mic_boost =
- AC97_SINGLE("Mic Boost (+20dB) Switch", AC97_MIC, 6, 1, 0);
+ AC97_SINGLE("Mic Boost (+20dB)", AC97_MIC, 6, 1, 0);
static const char* std_rec_sel[] = {"Mic", "CD", "Video", "Aux", "Line", "Mix", "Mix Mono", "Phone"};
@@ -615,7 +615,7 @@ AC97_SINGLE("Simulated Stereo Enhancemen
AC97_SINGLE("3D Control - Switch", AC97_GENERAL_PURPOSE, 13, 1, 0),
AC97_SINGLE("Loudness (bass boost)", AC97_GENERAL_PURPOSE, 12, 1, 0),
AC97_ENUM("Mono Output Select", std_enum[2]),
-AC97_ENUM("Mic Select Capture Switch", std_enum[3]),
+AC97_ENUM("Mic Select", std_enum[3]),
AC97_SINGLE("ADC/DAC Loopback", AC97_GENERAL_PURPOSE, 7, 1, 0)
};
_
Patches currently in -mm which might be from tiwai@xxxxxxx are
origin.patch
git-alsa.patch
git-geode.patch
maximum-latency-tracking-alsa-support.patch
--
VGER BF report: U 0.51873
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
