From df96e0a7cf243481dc547d01e2ece5d0a9963b7d Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 23 Oct 2012 10:34:16 -0700
Subject: [PATCH] --- yaml --- r: 342565 b: refs/heads/master c:
 9e13db806e07ae9fdb1c2135fc60ea09fcbf3f3c h: refs/heads/master i:   342563:
 ab0f3aaf73b9f745e57ca0aba0e5bd03e73e1663 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/pci/ice1712/psc724.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0601dff05cd7..951216f65493 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c902466800d777de55faab34214ec01987fca05e
+refs/heads/master: 9e13db806e07ae9fdb1c2135fc60ea09fcbf3f3c
diff --git a/trunk/sound/pci/ice1712/psc724.c b/trunk/sound/pci/ice1712/psc724.c
index 457cbaab0c6e..0b6c4e69b8d0 100644
--- a/trunk/sound/pci/ice1712/psc724.c
+++ b/trunk/sound/pci/ice1712/psc724.c
@@ -382,7 +382,7 @@ static void psc724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate)
 
 /* power management */
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int psc724_resume(struct snd_ice1712 *ice)
 {
 	struct psc724_spec *spec = ice->spec;
@@ -413,7 +413,7 @@ static int __devinit psc724_init(struct snd_ice1712 *ice)
 	snd_wm8776_init(&spec->wm8776);
 	spec->wm8766.ops.write = psc724_wm8766_write;
 	spec->wm8766.card = ice->card;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 	ice->pm_resume = psc724_resume;
 	ice->pm_suspend_enabled = 1;
 #endif