summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-17 18:45:43 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-17 18:45:43 (GMT)
commitd9478374106741d539d6b002e5e747d1ca9e4032 (patch)
treea8e0b68a49a5561b921007ae3909fc00fcb27e28
parent5164d74d74447895aaa31c094a1b9e666acaa656 (diff)
parent3c0709396df0869786f83e4b2d2d687c70ee886d (diff)
downloadlinux-fsl-qoriq-d9478374106741d539d6b002e5e747d1ca9e4032.tar.xz
Merge branch 'for-2.6.35' into for-2.6.36
-rw-r--r--sound/soc/codecs/wm8776.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 7e4a627..4e212ed 100644
--- 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"),