mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
162b187e19
1 changed files with 1 additions and 1 deletions
|
@ -191,7 +191,7 @@ static int speyside_late_probe(struct snd_soc_card *card)
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic");
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC");
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC");
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "Main Speaker");
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output");
|
||||||
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input");
|
snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue