aboutsummaryrefslogtreecommitdiff
path: root/sound/atmel
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-09 15:47:15 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-09 15:47:15 +0200
commitd34e4e00adbbc91ff9fc96ed9a4e4b65161868da (patch)
tree83db080b68eedf7b4fcc79b94358c2f884e0fdae /sound/atmel
parent94c142a160d63edac0e1fca7848960dcf75dd2a9 (diff)
downloadlinaro-lsk-d34e4e00adbbc91ff9fc96ed9a4e4b65161868da.tar.gz
ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM
When CONFIG_PM is set but CONFIG_PM_SLEEP is unset, SIMPLE_DEV_PM_OPS() ignores the given functions, and this leads to compile warnings. For avoiding this, simply check CONFIG_PM_SLEEP instead of CONFIG_PM. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/atmel')
-rw-r--r--sound/atmel/abdac.c2
-rw-r--r--sound/atmel/ac97c.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index eb4ceb71123..98554f4882b 100644
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -534,7 +534,7 @@ out_put_pclk:
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/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index bf47025bdf4..3c8d3ba7ddf 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -1134,7 +1134,7 @@ err_snd_card_new:
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);