Merge branch 'for-2.6.35' into for-2.6.36
This commit is contained in:
commit
d947837410
1 changed files with 0 additions and 1 deletions
|
@ -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"),
|
||||
|
|
Loading…
Add table
Reference in a new issue