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/riptide | |
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/riptide')
-rw-r--r-- | sound/pci/riptide/riptide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 760ee467cd9a..7d291542c5ba 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -464,7 +464,7 @@ struct snd_riptide { | |||
464 | 464 | ||
465 | unsigned long received_irqs; | 465 | unsigned long received_irqs; |
466 | unsigned long handled_irqs; | 466 | unsigned long handled_irqs; |
467 | #ifdef CONFIG_PM | 467 | #ifdef CONFIG_PM_SLEEP |
468 | int in_suspend; | 468 | int in_suspend; |
469 | #endif | 469 | #endif |
470 | }; | 470 | }; |
@@ -1150,7 +1150,7 @@ static void riptide_handleirq(unsigned long dev_id) | |||
1150 | } | 1150 | } |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | #ifdef CONFIG_PM | 1153 | #ifdef CONFIG_PM_SLEEP |
1154 | static int riptide_suspend(struct device *dev) | 1154 | static int riptide_suspend(struct device *dev) |
1155 | { | 1155 | { |
1156 | struct pci_dev *pci = to_pci_dev(dev); | 1156 | struct pci_dev *pci = to_pci_dev(dev); |
@@ -1193,7 +1193,7 @@ static SIMPLE_DEV_PM_OPS(riptide_pm, riptide_suspend, riptide_resume); | |||
1193 | #define RIPTIDE_PM_OPS &riptide_pm | 1193 | #define RIPTIDE_PM_OPS &riptide_pm |
1194 | #else | 1194 | #else |
1195 | #define RIPTIDE_PM_OPS NULL | 1195 | #define RIPTIDE_PM_OPS NULL |
1196 | #endif /* CONFIG_PM */ | 1196 | #endif /* CONFIG_PM_SLEEP */ |
1197 | 1197 | ||
1198 | static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip) | 1198 | static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip) |
1199 | { | 1199 | { |