summaryrefslogtreecommitdiffstats
path: root/kernel/power/Kconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-27 22:38:05 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-04 00:46:58 +0100
commitd30d819dc83107812d9b2876e5e7194e511ed6af (patch)
tree0c889e71575dca8d9caa26c89cd9ec741632c4fd /kernel/power/Kconfig
parentMerge branch 'pm-clk' into pm-runtime (diff)
downloadlinux-d30d819dc83107812d9b2876e5e7194e511ed6af.tar.xz
linux-d30d819dc83107812d9b2876e5e7194e511ed6af.zip
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 'kernel/power/Kconfig')
-rw-r--r--kernel/power/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 95d712e3677d..f8dc1cc8c4cb 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -298,10 +298,6 @@ config PM_GENERIC_DOMAINS_SLEEP
def_bool y
depends on PM_SLEEP && PM_GENERIC_DOMAINS
-config PM_GENERIC_DOMAINS_RUNTIME
- def_bool y
- depends on PM_RUNTIME && PM_GENERIC_DOMAINS
-
config PM_GENERIC_DOMAINS_OF
def_bool y
depends on PM_GENERIC_DOMAINS && OF