diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-09 15:47:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-09 15:47:15 +0200 |
| commit | d34e4e00adbbc91ff9fc96ed9a4e4b65161868da (patch) | |
| tree | 83db080b68eedf7b4fcc79b94358c2f884e0fdae /sound/arm | |
| parent | 94c142a160d63edac0e1fca7848960dcf75dd2a9 (diff) | |
| download | linux-stable-d34e4e00adbbc91ff9fc96ed9a4e4b65161868da.tar.gz linux-stable-d34e4e00adbbc91ff9fc96ed9a4e4b65161868da.tar.bz2 linux-stable-d34e4e00adbbc91ff9fc96ed9a4e4b65161868da.zip | |
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 = { .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 }, |