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/sh/configs | |
| 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/sh/configs')
| -rw-r--r-- | arch/sh/configs/apsh4ad0a_defconfig | 2 | ||||
| -rw-r--r-- | arch/sh/configs/sdk7786_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig index ec70475da890..a8d975793b6d 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig @@ -47,7 +47,7 @@ CONFIG_PREEMPT=y CONFIG_BINFMT_MISC=y CONFIG_PM=y CONFIG_PM_DEBUG=y -CONFIG_PM_RUNTIME=y +CONFIG_PM=y CONFIG_CPU_IDLE=y CONFIG_NET=y CONFIG_PACKET=y diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index 76a76a295d74..e7e56a4131b4 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -82,7 +82,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_MISC=y CONFIG_PM=y CONFIG_PM_DEBUG=y -CONFIG_PM_RUNTIME=y +CONFIG_PM=y CONFIG_CPU_IDLE=y CONFIG_NET=y CONFIG_PACKET=y |