Merge branch 'for-2.6.35' into for-2.6.36

d9478374 · Mark Brown · 5164d74d · 3c070939 · d9478374
Commit d9478374 authored Jul 17, 2010 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sound/soc/codecs/wm8776.c sound/soc/codecs/wm8776.c +0 -1

No files found.
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -94,7 +94,6 @@ SOC_DAPM_SINGLE("Bypass Switch", WM8776_OUTMUX, 2, 1, 0),

 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"),