diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-09 09:47:15 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-09 09:47:15 -0400 |
commit | d34e4e00adbbc91ff9fc96ed9a4e4b65161868da (patch) | |
tree | 83db080b68eedf7b4fcc79b94358c2f884e0fdae /sound/arm | |
parent | 94c142a160d63edac0e1fca7848960dcf75dd2a9 (diff) |
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/arm')
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 0d7b25e81643..4e1fda75c1c9 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -106,7 +106,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = { | |||
106 | .prepare = pxa2xx_ac97_pcm_prepare, | 106 | .prepare = pxa2xx_ac97_pcm_prepare, |
107 | }; | 107 | }; |
108 | 108 | ||
109 | #ifdef CONFIG_PM | 109 | #ifdef CONFIG_PM_SLEEP |
110 | 110 | ||
111 | static int pxa2xx_ac97_do_suspend(struct snd_card *card) | 111 | static int pxa2xx_ac97_do_suspend(struct snd_card *card) |
112 | { | 112 | { |
@@ -243,7 +243,7 @@ static struct platform_driver pxa2xx_ac97_driver = { | |||
243 | .driver = { | 243 | .driver = { |
244 | .name = "pxa2xx-ac97", | 244 | .name = "pxa2xx-ac97", |
245 | .owner = THIS_MODULE, | 245 | .owner = THIS_MODULE, |
246 | #ifdef CONFIG_PM | 246 | #ifdef CONFIG_PM_SLEEP |
247 | .pm = &pxa2xx_ac97_pm_ops, | 247 | .pm = &pxa2xx_ac97_pm_ops, |
248 | #endif | 248 | #endif |
249 | }, | 249 | }, |