aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/sama5_defconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-19 15:37:54 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-19 22:55:06 +0100
commit464ed18ebdb6236fcff59d2a35d4d2e28668435a (patch)
tree4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02 /arch/arm/configs/sama5_defconfig
parenttty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff)
downloadlinux-dev-464ed18ebdb6236fcff59d2a35d4d2e28668435a.tar.xz
linux-dev-464ed18ebdb6236fcff59d2a35d4d2e28668435a.zip
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/arm/configs/sama5_defconfig')
-rw-r--r--arch/arm/configs/sama5_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index b58fb32770a0..afa24799477a 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -32,7 +32,7 @@ CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_KERNEL_MODE_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_NET=y