diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 16:48:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 16:48:02 +0200 |
| commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
| tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /sound/soc/codecs/wm8776.c | |
| parent | ARM: fix build warning in asm/elf.h (diff) | |
| parent | Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2 (diff) | |
| download | linux-129961ecaf21c9ee899ad9067d917c1aa172fb7a.tar.xz linux-129961ecaf21c9ee899ad9067d917c1aa172fb7a.zip | |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
| -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"), |