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/mips | |
| 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/mips')
| -rw-r--r-- | arch/mips/configs/db1xxx_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/lemote2f_defconfig | 1 | ||||
| -rw-r--r-- | arch/mips/configs/loongson3_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/nlm_xlp_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/nlm_xlr_defconfig | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index 46e8f7676a15..3bdb72a70364 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig | |||
| @@ -36,7 +36,7 @@ CONFIG_PCI=y | |||
| 36 | CONFIG_PCI_REALLOC_ENABLE_AUTO=y | 36 | CONFIG_PCI_REALLOC_ENABLE_AUTO=y |
| 37 | CONFIG_PCCARD=y | 37 | CONFIG_PCCARD=y |
| 38 | CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y | 38 | CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y |
| 39 | CONFIG_PM_RUNTIME=y | 39 | CONFIG_PM=y |
| 40 | CONFIG_NET=y | 40 | CONFIG_NET=y |
| 41 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
| 42 | CONFIG_PACKET_DIAG=y | 42 | CONFIG_PACKET_DIAG=y |
diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index 227a9de32246..e51aad9a94b1 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig | |||
| @@ -37,7 +37,6 @@ CONFIG_MIPS32_N32=y | |||
| 37 | CONFIG_PM=y | 37 | CONFIG_PM=y |
| 38 | CONFIG_HIBERNATION=y | 38 | CONFIG_HIBERNATION=y |
| 39 | CONFIG_PM_STD_PARTITION="/dev/hda3" | 39 | CONFIG_PM_STD_PARTITION="/dev/hda3" |
| 40 | CONFIG_PM_RUNTIME=y | ||
| 41 | CONFIG_CPU_FREQ=y | 40 | CONFIG_CPU_FREQ=y |
| 42 | CONFIG_CPU_FREQ_DEBUG=y | 41 | CONFIG_CPU_FREQ_DEBUG=y |
| 43 | CONFIG_CPU_FREQ_STAT=m | 42 | CONFIG_CPU_FREQ_STAT=m |
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig index 1c6191ebd583..7eabcd2031ea 100644 --- a/arch/mips/configs/loongson3_defconfig +++ b/arch/mips/configs/loongson3_defconfig | |||
| @@ -58,7 +58,7 @@ CONFIG_BINFMT_MISC=m | |||
| 58 | CONFIG_MIPS32_COMPAT=y | 58 | CONFIG_MIPS32_COMPAT=y |
| 59 | CONFIG_MIPS32_O32=y | 59 | CONFIG_MIPS32_O32=y |
| 60 | CONFIG_MIPS32_N32=y | 60 | CONFIG_MIPS32_N32=y |
| 61 | CONFIG_PM_RUNTIME=y | 61 | CONFIG_PM=y |
| 62 | CONFIG_NET=y | 62 | CONFIG_NET=y |
| 63 | CONFIG_PACKET=y | 63 | CONFIG_PACKET=y |
| 64 | CONFIG_UNIX=y | 64 | CONFIG_UNIX=y |
diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig index 70509a48df82..b3d1d37f85ea 100644 --- a/arch/mips/configs/nlm_xlp_defconfig +++ b/arch/mips/configs/nlm_xlp_defconfig | |||
| @@ -61,7 +61,7 @@ CONFIG_BINFMT_MISC=y | |||
| 61 | CONFIG_MIPS32_COMPAT=y | 61 | CONFIG_MIPS32_COMPAT=y |
| 62 | CONFIG_MIPS32_O32=y | 62 | CONFIG_MIPS32_O32=y |
| 63 | CONFIG_MIPS32_N32=y | 63 | CONFIG_MIPS32_N32=y |
| 64 | CONFIG_PM_RUNTIME=y | 64 | CONFIG_PM=y |
| 65 | CONFIG_PM_DEBUG=y | 65 | CONFIG_PM_DEBUG=y |
| 66 | CONFIG_NET=y | 66 | CONFIG_NET=y |
| 67 | CONFIG_PACKET=y | 67 | CONFIG_PACKET=y |
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig index 82207e8079f3..3d8016d6cf3e 100644 --- a/arch/mips/configs/nlm_xlr_defconfig +++ b/arch/mips/configs/nlm_xlr_defconfig | |||
| @@ -41,7 +41,7 @@ CONFIG_PCI=y | |||
| 41 | CONFIG_PCI_MSI=y | 41 | CONFIG_PCI_MSI=y |
| 42 | CONFIG_PCI_DEBUG=y | 42 | CONFIG_PCI_DEBUG=y |
| 43 | CONFIG_BINFMT_MISC=m | 43 | CONFIG_BINFMT_MISC=m |
| 44 | CONFIG_PM_RUNTIME=y | 44 | CONFIG_PM=y |
| 45 | CONFIG_PM_DEBUG=y | 45 | CONFIG_PM_DEBUG=y |
| 46 | CONFIG_NET=y | 46 | CONFIG_NET=y |
| 47 | CONFIG_PACKET=y | 47 | CONFIG_PACKET=y |