diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-17 14:45:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-17 14:45:43 -0400 |
| commit | d9478374106741d539d6b002e5e747d1ca9e4032 (patch) | |
| tree | a8e0b68a49a5561b921007ae3909fc00fcb27e28 /sound/soc/codecs | |
| parent | 5164d74d74447895aaa31c094a1b9e666acaa656 (diff) | |
| parent | 3c0709396df0869786f83e4b2d2d687c70ee886d (diff) | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8776.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 7e4a627b4c7..4e212ed62ea 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), | |||
| 94 | 94 | ||
| 95 | static const struct snd_soc_dapm_widget wm8776_dapm_widgets[] = { | 95 | static const struct snd_soc_dapm_widget wm8776_dapm_widgets[] = { |
| 96 | SND_SOC_DAPM_INPUT("AUX"), | 96 | SND_SOC_DAPM_INPUT("AUX"), |
| 97 | SND_SOC_DAPM_INPUT("AUX"), | ||
| 98 | 97 | ||
| 99 | SND_SOC_DAPM_INPUT("AIN1"), | 98 | SND_SOC_DAPM_INPUT("AIN1"), |
| 100 | SND_SOC_DAPM_INPUT("AIN2"), | 99 | SND_SOC_DAPM_INPUT("AIN2"), |