From 5e27e3d10329258b5faf41316c189e36060d5503 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 31 Jan 2012 15:30:28 +0000
Subject: [PATCH] --- yaml --- r: 293264 b: refs/heads/master c:
 5aa44b132eca1d08f5bb9c5c5cb46eec612db686 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c7ef481f852b..6becd5a4c56d 100644
--- 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
index 35a1e639d7f9..091d5f37ae64 100644
--- 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);