diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 15:37:54 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 22:55:06 +0100 |
commit | 464ed18ebdb6236fcff59d2a35d4d2e28668435a (patch) | |
tree | 4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02 /arch/arm/configs/keystone_defconfig | |
parent | tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff) | |
download | linux-464ed18ebdb6236fcff59d2a35d4d2e28668435a.tar.xz linux-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/keystone_defconfig')
-rw-r--r-- | arch/arm/configs/keystone_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 20a3ff99fae2..a2067cbfe173 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -30,7 +30,7 @@ CONFIG_HIGHMEM=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_SUSPEND is not set -CONFIG_PM_RUNTIME=y +CONFIG_PM=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y |