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 /include/acpi | |
| 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 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 78ca429929f7..ff103ba96b78 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -381,7 +381,7 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); | |||
| 381 | int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); | 381 | int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); |
| 382 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | 382 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
| 383 | 383 | ||
| 384 | #ifdef CONFIG_PM_OPS | 384 | #ifdef CONFIG_PM |
| 385 | int acpi_pm_device_sleep_state(struct device *, int *); | 385 | int acpi_pm_device_sleep_state(struct device *, int *); |
| 386 | #else | 386 | #else |
| 387 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) | 387 | static inline int acpi_pm_device_sleep_state(struct device *d, int *p) |