diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-10 18:06:54 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-14 19:43:15 -0400 |
commit | aa33860158114d0df3c7997bc1dd41c0168e1c2a (patch) | |
tree | a1ae98c42232835780618b0a5dea78c5478ed58c /drivers/usb/core | |
parent | 196ec243224bb38fc5c41d9fa4050f70708b7fb4 (diff) |
PM: Remove CONFIG_PM_OPS
After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP ||
CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be
replaced with CONFIG_PM.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hcd-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index f71e8e307e0f..64a035ba2eab 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c | |||
@@ -335,7 +335,7 @@ void usb_hcd_pci_shutdown(struct pci_dev *dev) | |||
335 | } | 335 | } |
336 | EXPORT_SYMBOL_GPL(usb_hcd_pci_shutdown); | 336 | EXPORT_SYMBOL_GPL(usb_hcd_pci_shutdown); |
337 | 337 | ||
338 | #ifdef CONFIG_PM_OPS | 338 | #ifdef CONFIG_PM |
339 | 339 | ||
340 | #ifdef CONFIG_PPC_PMAC | 340 | #ifdef CONFIG_PPC_PMAC |
341 | static void powermac_set_asic(struct pci_dev *pci_dev, int enable) | 341 | static void powermac_set_asic(struct pci_dev *pci_dev, int enable) |
@@ -580,4 +580,4 @@ const struct dev_pm_ops usb_hcd_pci_pm_ops = { | |||
580 | }; | 580 | }; |
581 | EXPORT_SYMBOL_GPL(usb_hcd_pci_pm_ops); | 581 | EXPORT_SYMBOL_GPL(usb_hcd_pci_pm_ops); |
582 | 582 | ||
583 | #endif /* CONFIG_PM_OPS */ | 583 | #endif /* CONFIG_PM */ |