---

yaml --- r: 293414 b: refs/heads/master c: b1dd589 h: refs/heads/master v: v3
git-mirror · Feb 24, 2012 · 1ace772 · 1ace772
1 parent a1149b0
commit 1ace772
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0512615db6dbf5ab7d5b6f46ebbe657707bb9dad
+refs/heads/master: b1dd5897f53647390a7622795541bc89f8a84fe2
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1718,8 +1718,12 @@ int snd_soc_poweroff(struct device *dev)
 EXPORT_SYMBOL_GPL(snd_soc_poweroff);
 
 const struct dev_pm_ops snd_soc_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(snd_soc_suspend, snd_soc_resume)
+	.suspend = snd_soc_suspend,
+	.resume = snd_soc_resume,
+	.freeze = snd_soc_suspend,
+	.thaw = snd_soc_resume,
 	.poweroff = snd_soc_poweroff,
+	.restore = snd_soc_resume,
 };
 EXPORT_SYMBOL_GPL(snd_soc_pm_ops);