diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 11:04:45 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 11:04:45 -0500 |
| commit | 162b187e197a9accd8b73001839645b4617c5fb2 (patch) | |
| tree | a871085a6abac17c7ef86c33c7f1e706eadc8288 /sound/soc | |
| parent | a290986b2a184941da60921ada71bcb47a0d4af2 (diff) | |
| parent | 5b895eec118ab5fec7b69102d73c1b04a86140b9 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/samsung/speyside.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 11196b9b319e..18e6356e86db 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c | |||
| @@ -191,7 +191,7 @@ static int speyside_late_probe(struct snd_soc_card *card) | |||
| 191 | snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic"); | 191 | snd_soc_dapm_ignore_suspend(&card->dapm, "Headset Mic"); |
| 192 | snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC"); | 192 | snd_soc_dapm_ignore_suspend(&card->dapm, "Main AMIC"); |
| 193 | snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC"); | 193 | snd_soc_dapm_ignore_suspend(&card->dapm, "Main DMIC"); |
| 194 | snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); | 194 | snd_soc_dapm_ignore_suspend(&card->dapm, "Main Speaker"); |
| 195 | snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output"); | 195 | snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Output"); |
| 196 | snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input"); | 196 | snd_soc_dapm_ignore_suspend(&card->dapm, "WM1250 Input"); |
| 197 | 197 | ||