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>

diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index db81d8c..9e9a72e 100644 (file)
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_BINFMT_MISC=y
-CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

diff --cc arch/arm/configs/armadillo800eva_defconfig
Simple merge

diff --cc arch/arm/configs/bcm_defconfig
Simple merge

diff --cc arch/arm/configs/bockw_defconfig
Simple merge

diff --cc arch/arm/configs/davinci_all_defconfig
Simple merge

diff --cc arch/arm/configs/exynos_defconfig
Simple merge

diff --cc arch/arm/configs/ezx_defconfig
Simple merge

diff --cc arch/arm/configs/hisi_defconfig
Simple merge

diff --cc arch/arm/configs/imote2_defconfig
Simple merge

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge

diff --cc arch/arm/configs/keystone_defconfig
Simple merge

diff --cc arch/arm/configs/kzm9g_defconfig
Simple merge

diff --cc arch/arm/configs/lager_defconfig
Simple merge

diff --cc arch/arm/configs/mackerel_defconfig
Simple merge

diff --cc arch/arm/configs/marzen_defconfig
Simple merge

diff --cc arch/arm/configs/omap1_defconfig
Simple merge

diff --cc arch/arm/configs/prima2_defconfig
Simple merge

diff --cc arch/arm/configs/sama5_defconfig
Simple merge

diff --cc arch/arm/configs/shmobile_defconfig
Simple merge

diff --cc arch/arm/configs/sunxi_defconfig
Simple merge

diff --cc arch/arm/configs/tegra_defconfig
Simple merge

diff --cc arch/arm/configs/u8500_defconfig
Simple merge

diff --cc arch/arm/configs/vt8500_v6_v7_defconfig
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/mips/configs/db1xxx_defconfig
Simple merge

diff --cc arch/mips/configs/lemote2f_defconfig
Simple merge

diff --cc arch/mips/configs/loongson3_defconfig
Simple merge

diff --cc arch/mips/configs/nlm_xlp_defconfig
Simple merge

diff --cc arch/mips/configs/nlm_xlr_defconfig
Simple merge

diff --cc arch/powerpc/configs/ps3_defconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sh/configs/apsh4ad0a_defconfig
Simple merge

diff --cc arch/sh/configs/sdk7786_defconfig
Simple merge

diff --cc drivers/usb/host/isp1760-hcd.c
Simple merge

diff --cc drivers/usb/host/oxu210hp-hcd.c
Simple merge

diff --cc include/linux/devfreq.h
Simple merge

diff --cc kernel/power/Kconfig
Simple merge