diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-17 20:45:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-17 20:45:43 +0200 |
| commit | d9478374106741d539d6b002e5e747d1ca9e4032 (patch) | |
| tree | a8e0b68a49a5561b921007ae3909fc00fcb27e28 /sound | |
| parent | ASoC: Handle read failures in codec_reg (diff) | |
| parent | ASoC: Remove duplicate AUX definition from WM8776 (diff) | |
| download | linux-d9478374106741d539d6b002e5e747d1ca9e4032.tar.xz linux-d9478374106741d539d6b002e5e747d1ca9e4032.zip | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound')
| -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 7e4a627b4c7e..4e212ed62ea6 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"), |