diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-08-14 18:12:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-14 18:12:04 +0200 |
| commit | c7561cd80469f2fe4a6be0984db57832ee7f2a3b (patch) | |
| tree | 02ce843b7caed4d41ef6d17450e6b05b96c94952 /sound/pci/trident | |
| parent | ALSA: hda - Fix possible compile warnings regarding CONFIG_PM (diff) | |
| download | wireguard-linux-c7561cd80469f2fe4a6be0984db57832ee7f2a3b.tar.xz wireguard-linux-c7561cd80469f2fe4a6be0984db57832ee7f2a3b.zip | |
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/trident')
| -rw-r--r-- | sound/pci/trident/trident.c | 2 | ||||
| -rw-r--r-- | sound/pci/trident/trident_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index d36e6ca147e1..8a6f1f76e870 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -177,7 +177,7 @@ static struct pci_driver trident_driver = { .id_table = snd_trident_ids, .probe = snd_trident_probe, .remove = __devexit_p(snd_trident_remove), -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .driver = { .pm = &snd_trident_pm, }, diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 94011dcae731..06b10d1a76e5 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -3919,7 +3919,7 @@ static void snd_trident_clear_voices(struct snd_trident * trident, unsigned shor } } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int snd_trident_suspend(struct device *dev) { struct pci_dev *pci = to_pci_dev(dev); @@ -3983,4 +3983,4 @@ static int snd_trident_resume(struct device *dev) } SIMPLE_DEV_PM_OPS(snd_trident_pm, snd_trident_suspend, snd_trident_resume); -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ |