Merge branch 'for-2.6.35' into for-2.6.36 (d9478374) · Commits · 方亚芬 / linux

sound/soc/codecs/wm8776.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"),