From a82e56a3dc48e50d7af8646d6d6b7d5bd88af580 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 9 Aug 2012 15:47:15 +0200
Subject: [PATCH] --- yaml --- r: 321903 b: refs/heads/master c:
 d34e4e00adbbc91ff9fc96ed9a4e4b65161868da h: refs/heads/master i:   321901:
 bddf3496521ca3125a7e7af9ece48188ad7de29d   321899:
 733b3fd6250dd833a4a3b77bab9c6fcfb784eae6   321895:
 1df034e55feb28e10a4d60b80d04999c1e99fd77   321887:
 3deb41aac902392495768c58117e297bd42fb6ab v: v3

---
 [refs]                          | 2 +-
 trunk/sound/arm/pxa2xx-ac97.c   | 4 ++--
 trunk/sound/atmel/abdac.c       | 2 +-
 trunk/sound/atmel/ac97c.c       | 2 +-
 trunk/sound/drivers/aloop.c     | 2 +-
 trunk/sound/drivers/dummy.c     | 2 +-
 trunk/sound/drivers/pcsp/pcsp.c | 4 ++--
 trunk/sound/ppc/powermac.c      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 97154181e024..e2fbaba469d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c142a160d63edac0e1fca7848960dcf75dd2a9
+refs/heads/master: d34e4e00adbbc91ff9fc96ed9a4e4b65161868da
diff --git a/trunk/sound/arm/pxa2xx-ac97.c b/trunk/sound/arm/pxa2xx-ac97.c
index 0d7b25e81643..4e1fda75c1c9 100644
--- a/trunk/sound/arm/pxa2xx-ac97.c
+++ b/trunk/sound/arm/pxa2xx-ac97.c
@@ -106,7 +106,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {
 	.prepare		= pxa2xx_ac97_pcm_prepare,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static int pxa2xx_ac97_do_suspend(struct snd_card *card)
 {
@@ -243,7 +243,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
 	.driver		= {
 		.name	= "pxa2xx-ac97",
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 		.pm	= &pxa2xx_ac97_pm_ops,
 #endif
 	},
diff --git a/trunk/sound/atmel/abdac.c b/trunk/sound/atmel/abdac.c
index eb4ceb71123e..98554f4882b7 100644
--- a/trunk/sound/atmel/abdac.c
+++ b/trunk/sound/atmel/abdac.c
@@ -534,7 +534,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
 	return retval;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atmel_abdac_suspend(struct device *pdev)
 {
 	struct snd_card *card = dev_get_drvdata(pdev);
diff --git a/trunk/sound/atmel/ac97c.c b/trunk/sound/atmel/ac97c.c
index bf47025bdf45..3c8d3ba7ddfc 100644
--- a/trunk/sound/atmel/ac97c.c
+++ b/trunk/sound/atmel/ac97c.c
@@ -1134,7 +1134,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
 	return retval;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atmel_ac97c_suspend(struct device *pdev)
 {
 	struct snd_card *card = dev_get_drvdata(pdev);
diff --git a/trunk/sound/drivers/aloop.c b/trunk/sound/drivers/aloop.c
index 1128b35b2b05..5a34355e78e8 100644
--- a/trunk/sound/drivers/aloop.c
+++ b/trunk/sound/drivers/aloop.c
@@ -1176,7 +1176,7 @@ static int __devexit loopback_remove(struct platform_device *devptr)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int loopback_suspend(struct device *pdev)
 {
 	struct snd_card *card = dev_get_drvdata(pdev);
diff --git a/trunk/sound/drivers/dummy.c b/trunk/sound/drivers/dummy.c
index f7d3bfc6bca8..54bb6644a598 100644
--- a/trunk/sound/drivers/dummy.c
+++ b/trunk/sound/drivers/dummy.c
@@ -1064,7 +1064,7 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int snd_dummy_suspend(struct device *pdev)
 {
 	struct snd_card *card = dev_get_drvdata(pdev);
diff --git a/trunk/sound/drivers/pcsp/pcsp.c b/trunk/sound/drivers/pcsp/pcsp.c
index 6ca59fc6dcb9..ef171295f6d4 100644
--- a/trunk/sound/drivers/pcsp/pcsp.c
+++ b/trunk/sound/drivers/pcsp/pcsp.c
@@ -199,7 +199,7 @@ static void pcsp_stop_beep(struct snd_pcsp *chip)
 	pcspkr_stop_sound();
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int pcsp_suspend(struct device *dev)
 {
 	struct snd_pcsp *chip = dev_get_drvdata(dev);
@@ -212,7 +212,7 @@ static SIMPLE_DEV_PM_OPS(pcsp_pm, pcsp_suspend, NULL);
 #define PCSP_PM_OPS	&pcsp_pm
 #else
 #define PCSP_PM_OPS	NULL
-#endif	/* CONFIG_PM */
+#endif	/* CONFIG_PM_SLEEP */
 
 static void pcsp_shutdown(struct platform_device *dev)
 {
diff --git a/trunk/sound/ppc/powermac.c b/trunk/sound/ppc/powermac.c
index f5ceb6f282de..210cafe04890 100644
--- a/trunk/sound/ppc/powermac.c
+++ b/trunk/sound/ppc/powermac.c
@@ -143,7 +143,7 @@ static int __devexit snd_pmac_remove(struct platform_device *devptr)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int snd_pmac_driver_suspend(struct device *dev)
 {
 	struct snd_card *card = dev_get_drvdata(dev);