---

yaml --- r: 293264 b: refs/heads/master c: 5aa44b1 h: refs/heads/master v: v3
git-mirror · Jan 31, 2012 · 5e27e3d · 5e27e3d
1 parent ddda368
commit 5e27e3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489773c22397c001f54ba4f30856f24407d8d091
+refs/heads/master: 5aa44b132eca1d08f5bb9c5c5cb46eec612db686
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1663,8 +1663,7 @@ int snd_soc_poweroff(struct device *dev)
 EXPORT_SYMBOL_GPL(snd_soc_poweroff);
 
 const struct dev_pm_ops snd_soc_pm_ops = {
-	.suspend = snd_soc_suspend,
-	.resume = snd_soc_resume,
+	SET_SYSTEM_SLEEP_PM_OPS(snd_soc_suspend, snd_soc_resume)
 	.poweroff = snd_soc_poweroff,
 };
 EXPORT_SYMBOL_GPL(snd_soc_pm_ops);