summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/speyside.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 20:04:45 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 20:04:45 +0400
commit162b187e197a9accd8b73001839645b4617c5fb2 (patch)
treea871085a6abac17c7ef86c33c7f1e706eadc8288 /sound/soc/samsung/speyside.c
parenta290986b2a184941da60921ada71bcb47a0d4af2 (diff)
parent5b895eec118ab5fec7b69102d73c1b04a86140b9 (diff)
downloadlinux-162b187e197a9accd8b73001839645b4617c5fb2.tar.xz
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/samsung/speyside.c')
-rw-r--r--sound/soc/samsung/speyside.c2
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)
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 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 Input");