diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-27 16:38:05 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-03 18:46:58 -0500 |
commit | d30d819dc83107812d9b2876e5e7194e511ed6af (patch) | |
tree | 0c889e71575dca8d9caa26c89cd9ec741632c4fd /include/linux/pm.h | |
parent | ef9cc993cd2e3524d86e86e9ad510e8f34b9c078 (diff) |
PM: Drop CONFIG_PM_RUNTIME from the driver core
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so quite a few
depend on CONFIG_PM or even may be dropped entirely in some cases.
Replace CONFIG_PM_RUNTIME with CONFIG_PM in the PM core code.
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/pm.h')
-rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 383fd68aaee1..53b56cf5db3f 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -576,7 +576,7 @@ struct dev_pm_info { | |||
576 | #else | 576 | #else |
577 | unsigned int should_wakeup:1; | 577 | unsigned int should_wakeup:1; |
578 | #endif | 578 | #endif |
579 | #ifdef CONFIG_PM_RUNTIME | 579 | #ifdef CONFIG_PM |
580 | struct timer_list suspend_timer; | 580 | struct timer_list suspend_timer; |
581 | unsigned long timer_expires; | 581 | unsigned long timer_expires; |
582 | struct work_struct work; | 582 | struct work_struct work; |