Merge branch 'for-2.6.35' into for-2.6.36

git-mirror · Jul 17, 2010 · d947837 · d947837
2 parents 5164d74 + 3c07093
commit d947837
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"),