From 1ace7725b77e95e68b19ca98cb1d78c560b30fb3 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@st.com>
Date: Fri, 24 Feb 2012 16:25:49 +0530
Subject: [PATCH] --- yaml --- r: 293414 b: refs/heads/master c:
 b1dd5897f53647390a7622795541bc89f8a84fe2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2ec933cc1125..ded3399b2e65 100644
--- 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
index fc0fd3485e7d..1bdc67e0bd16 100644
--- 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);