diff options
Diffstat (limited to 'sound/pci/oxygen')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 2 | ||||
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 4 | ||||
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 37520a2b4dcf..2becae155a48 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -872,7 +872,7 @@ static struct pci_driver oxygen_driver = { | |||
872 | .id_table = oxygen_ids, | 872 | .id_table = oxygen_ids, |
873 | .probe = generic_oxygen_probe, | 873 | .probe = generic_oxygen_probe, |
874 | .remove = __devexit_p(oxygen_pci_remove), | 874 | .remove = __devexit_p(oxygen_pci_remove), |
875 | #ifdef CONFIG_PM | 875 | #ifdef CONFIG_PM_SLEEP |
876 | .driver = { | 876 | .driver = { |
877 | .pm = &oxygen_pci_pm, | 877 | .pm = &oxygen_pci_pm, |
878 | }, | 878 | }, |
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 7112a89fb8bd..09a24b24958b 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -161,7 +161,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
161 | ) | 161 | ) |
162 | ); | 162 | ); |
163 | void oxygen_pci_remove(struct pci_dev *pci); | 163 | void oxygen_pci_remove(struct pci_dev *pci); |
164 | #ifdef CONFIG_PM | 164 | #ifdef CONFIG_PM_SLEEP |
165 | extern const struct dev_pm_ops oxygen_pci_pm; | 165 | extern const struct dev_pm_ops oxygen_pci_pm; |
166 | #endif | 166 | #endif |
167 | void oxygen_pci_shutdown(struct pci_dev *pci); | 167 | void oxygen_pci_shutdown(struct pci_dev *pci); |
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index ab8738e21ad1..25697584b94c 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -726,7 +726,7 @@ void oxygen_pci_remove(struct pci_dev *pci) | |||
726 | } | 726 | } |
727 | EXPORT_SYMBOL(oxygen_pci_remove); | 727 | EXPORT_SYMBOL(oxygen_pci_remove); |
728 | 728 | ||
729 | #ifdef CONFIG_PM | 729 | #ifdef CONFIG_PM_SLEEP |
730 | static int oxygen_pci_suspend(struct device *dev) | 730 | static int oxygen_pci_suspend(struct device *dev) |
731 | { | 731 | { |
732 | struct pci_dev *pci = to_pci_dev(dev); | 732 | struct pci_dev *pci = to_pci_dev(dev); |
@@ -824,7 +824,7 @@ static int oxygen_pci_resume(struct device *dev) | |||
824 | 824 | ||
825 | SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume); | 825 | SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume); |
826 | EXPORT_SYMBOL(oxygen_pci_pm); | 826 | EXPORT_SYMBOL(oxygen_pci_pm); |
827 | #endif /* CONFIG_PM */ | 827 | #endif /* CONFIG_PM_SLEEP */ |
828 | 828 | ||
829 | void oxygen_pci_shutdown(struct pci_dev *pci) | 829 | void oxygen_pci_shutdown(struct pci_dev *pci) |
830 | { | 830 | { |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index d3b606b69f3b..3d71423b23bc 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = { | |||
93 | .id_table = xonar_ids, | 93 | .id_table = xonar_ids, |
94 | .probe = xonar_probe, | 94 | .probe = xonar_probe, |
95 | .remove = __devexit_p(oxygen_pci_remove), | 95 | .remove = __devexit_p(oxygen_pci_remove), |
96 | #ifdef CONFIG_PM | 96 | #ifdef CONFIG_PM_SLEEP |
97 | .driver = { | 97 | .driver = { |
98 | .pm = &oxygen_pci_pm, | 98 | .pm = &oxygen_pci_pm, |
99 | }, | 99 | }, |