summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/ps3_defconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-19 17:37:54 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-20 00:55:06 +0300
commit464ed18ebdb6236fcff59d2a35d4d2e28668435a (patch)
tree4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02 /arch/powerpc/configs/ps3_defconfig
parent71504e519d779261f03fb547c0439500b2e5fa9b (diff)
downloadlinux-464ed18ebdb6236fcff59d2a35d4d2e28668435a.tar.xz
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>
Diffstat (limited to 'arch/powerpc/configs/ps3_defconfig')
-rw-r--r--arch/powerpc/configs/ps3_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 2e637c881d2b..879de5efb073 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -36,7 +36,7 @@ CONFIG_KEXEC=y
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