diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
commit | c7561cd80469f2fe4a6be0984db57832ee7f2a3b (patch) | |
tree | 02ce843b7caed4d41ef6d17450e6b05b96c94952 /sound/pci/cmipci.c | |
parent | 7ccbde57ce312ff1388c2990699f8863280808ac (diff) |
ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP
Otherwise we may get compile warnings due to unused functions.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r-- | sound/pci/cmipci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index b7d6f2b886ef..7c25906b5f88 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -504,7 +504,7 @@ struct cmipci { | |||
504 | 504 | ||
505 | spinlock_t reg_lock; | 505 | spinlock_t reg_lock; |
506 | 506 | ||
507 | #ifdef CONFIG_PM | 507 | #ifdef CONFIG_PM_SLEEP |
508 | unsigned int saved_regs[0x20]; | 508 | unsigned int saved_regs[0x20]; |
509 | unsigned char saved_mixers[0x20]; | 509 | unsigned char saved_mixers[0x20]; |
510 | #endif | 510 | #endif |
@@ -3315,7 +3315,7 @@ static void __devexit snd_cmipci_remove(struct pci_dev *pci) | |||
3315 | } | 3315 | } |
3316 | 3316 | ||
3317 | 3317 | ||
3318 | #ifdef CONFIG_PM | 3318 | #ifdef CONFIG_PM_SLEEP |
3319 | /* | 3319 | /* |
3320 | * power management | 3320 | * power management |
3321 | */ | 3321 | */ |
@@ -3403,7 +3403,7 @@ static SIMPLE_DEV_PM_OPS(snd_cmipci_pm, snd_cmipci_suspend, snd_cmipci_resume); | |||
3403 | #define SND_CMIPCI_PM_OPS &snd_cmipci_pm | 3403 | #define SND_CMIPCI_PM_OPS &snd_cmipci_pm |
3404 | #else | 3404 | #else |
3405 | #define SND_CMIPCI_PM_OPS NULL | 3405 | #define SND_CMIPCI_PM_OPS NULL |
3406 | #endif /* CONFIG_PM */ | 3406 | #endif /* CONFIG_PM_SLEEP */ |
3407 | 3407 | ||
3408 | static struct pci_driver cmipci_driver = { | 3408 | static struct pci_driver cmipci_driver = { |
3409 | .name = KBUILD_MODNAME, | 3409 | .name = KBUILD_MODNAME, |