diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 09:37:54 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 16:55:06 -0500 |
| commit | 464ed18ebdb6236fcff59d2a35d4d2e28668435a (patch) | |
| tree | 4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02 /arch/arm/configs/hisi_defconfig | |
| parent | 71504e519d779261f03fb547c0439500b2e5fa9b (diff) | |
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/hisi_defconfig')
| -rw-r--r-- | arch/arm/configs/hisi_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index 1fe3621faf65..112543665dd7 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig | |||
| @@ -18,7 +18,7 @@ CONFIG_ARM_APPENDED_DTB=y | |||
| 18 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 18 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
| 19 | CONFIG_NEON=y | 19 | CONFIG_NEON=y |
| 20 | CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y | 20 | CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y |
| 21 | CONFIG_PM_RUNTIME=y | 21 | CONFIG_PM=y |
| 22 | CONFIG_NET=y | 22 | CONFIG_NET=y |
| 23 | CONFIG_PACKET=y | 23 | CONFIG_PACKET=y |
| 24 | CONFIG_UNIX=y | 24 | CONFIG_UNIX=y |