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/pci/pci-driver.c | |
| 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/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 88246dd46452..d86ea8b01137 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
| @@ -431,7 +431,7 @@ static void pci_device_shutdown(struct device *dev) | |||
| 431 | pci_msix_shutdown(pci_dev); | 431 | pci_msix_shutdown(pci_dev); |
| 432 | } | 432 | } |
| 433 | 433 | ||
| 434 | #ifdef CONFIG_PM_OPS | 434 | #ifdef CONFIG_PM |
| 435 | 435 | ||
| 436 | /* Auxiliary functions used for system resume and run-time resume. */ | 436 | /* Auxiliary functions used for system resume and run-time resume. */ |
| 437 | 437 | ||
| @@ -1059,7 +1059,7 @@ static int pci_pm_runtime_idle(struct device *dev) | |||
| 1059 | 1059 | ||
| 1060 | #endif /* !CONFIG_PM_RUNTIME */ | 1060 | #endif /* !CONFIG_PM_RUNTIME */ |
| 1061 | 1061 | ||
| 1062 | #ifdef CONFIG_PM_OPS | 1062 | #ifdef CONFIG_PM |
| 1063 | 1063 | ||
| 1064 | const struct dev_pm_ops pci_dev_pm_ops = { | 1064 | const struct dev_pm_ops pci_dev_pm_ops = { |
| 1065 | .prepare = pci_pm_prepare, | 1065 | .prepare = pci_pm_prepare, |