| | Date | Fri, 30 Jul 2010 10:52:05 -0700 | | From | Greg KH <> | | Subject | [108/205] ASoC: Remove duplicate AUX definition from WM8776 |
| |
2.6.34-stable review patch. If anyone has any objections, please let us know.
------------------ From: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3c0709396df0869786f83e4b2d2d687c70ee886d upstream.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- sound/soc/codecs/wm8776.c | 1 - 1 file changed, 1 deletion(-) --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -94,7 +94,6 @@ SOC_DAPM_SINGLE("Bypass Switch", WM8776_ static const struct snd_soc_dapm_widget wm8776_dapm_widgets[] = { SND_SOC_DAPM_INPUT("AUX"), -SND_SOC_DAPM_INPUT("AUX"), SND_SOC_DAPM_INPUT("AIN1"), SND_SOC_DAPM_INPUT("AIN2"),
|