commit 464ed18ebdb6236fcff59d2a35d4d2e28668435a
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Fri Dec 19 15:37:54 2014 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Fri Dec 19 22:55:06 2014 +0100
tree 4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02
parent 71504e519d779261f03fb547c0439500b2e5fa9b

PM: Eliminate CONFIG_PM_RUNTIME

Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>

arch/powerpc/configs/ps3_defconfig

diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 2e637c8..879de5e 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -36,7 +36,7 @@
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE=""
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 # CONFIG_SECCOMP is not set
 # CONFIG_PCI is not set