diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-11 00:06:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-15 00:43:15 +0100 |
| commit | aa33860158114d0df3c7997bc1dd41c0168e1c2a (patch) | |
| tree | a1ae98c42232835780618b0a5dea78c5478ed58c /drivers/acpi | |
| parent | 196ec243224bb38fc5c41d9fa4050f70708b7fb4 (diff) | |
| download | talos-op-linux-aa33860158114d0df3c7997bc1dd41c0168e1c2a.tar.gz talos-op-linux-aa33860158114d0df3c7997bc1dd41c0168e1c2a.zip | |
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/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index d6a8cd14de2e..8ea092fad3f6 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -585,7 +585,7 @@ int acpi_suspend(u32 acpi_state) return -EINVAL; } -#ifdef CONFIG_PM_OPS +#ifdef CONFIG_PM /** * acpi_pm_device_sleep_state - return preferred power state of ACPI device * in the system sleep state given by %acpi_target_sleep_state @@ -671,7 +671,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p) *d_min_p = d_min; return d_max; } -#endif /* CONFIG_PM_OPS */ +#endif /* CONFIG_PM */ #ifdef CONFIG_PM_SLEEP /** |
