From aa63243ef9bf98a3aa248d9e305f390d9cef1c56 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 17 Jun 2008 19:19:34 +0100
Subject: [PATCH] --- yaml --- r: 99126 b: refs/heads/master c:
 1301a964cef2759d46b4ce366eeeee1f869731f9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 698cbc918d4f..5df87fc64319 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f52845ad771a2b62bc06bc940f16c8f6296654ec
+refs/heads/master: 1301a964cef2759d46b4ce366eeeee1f869731f9
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index b931039632c5..bdbbc6a980fa 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -825,8 +825,10 @@ static int soc_probe(struct platform_device *pdev)
 
 	/* DAPM stream work */
 	INIT_DELAYED_WORK(&socdev->delayed_work, close_delayed_work);
+#ifdef CONFIG_PM
 	/* deferred resume work */
 	INIT_WORK(&socdev->deferred_resume_work, soc_resume_deferred);
+#endif
 
 	return 0;