PM / Kconfig: Replace PM_RUNTIME with PM in dependencies

After commit b2b49ccbdd (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so Kconfig options
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace PM_RUNTIME with PM in Kconfig dependencies throughout the
tree.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Rafael J. Wysocki 2014-12-13 00:44:04 +01:00
parent bf7c5449e6
commit 1b3e3aa6c5
9 changed files with 10 additions and 10 deletions

View File

@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS
select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C_RTC if RTC_CLASS
select PINCTRL select PINCTRL
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM_RUNTIME select PM_GENERIC_DOMAINS if PM
select S5P_DEV_MFC select S5P_DEV_MFC
select SRAM select SRAM
select MFD_SYSCON select MFD_SYSCON

View File

@ -232,7 +232,7 @@ config IA64_SGI_UV
config IA64_HP_SIM config IA64_HP_SIM
bool "Ski-simulator" bool "Ski-simulator"
select SWIOTLB select SWIOTLB
depends on !PM_RUNTIME depends on !PM
endchoice endchoice

View File

@ -61,7 +61,7 @@ config ATA_ACPI
config SATA_ZPODD config SATA_ZPODD
bool "SATA Zero Power Optical Disc Drive (ZPODD) support" bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
depends on ATA_ACPI && PM_RUNTIME depends on ATA_ACPI && PM
default n default n
help help
This option adds support for SATA Zero Power Optical Disc This option adds support for SATA Zero Power Optical Disc

View File

@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG
config VIDEO_S3C_CAMIF config VIDEO_S3C_CAMIF
tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
depends on PM_RUNTIME depends on PM
depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
depends on HAS_DMA depends on HAS_DMA
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG

View File

@ -8,7 +8,7 @@
config VIDEO_SAMSUNG_S5P_TV config VIDEO_SAMSUNG_S5P_TV
bool "Samsung TV driver for S5P platform" bool "Samsung TV driver for S5P platform"
depends on PM_RUNTIME depends on PM
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
default n default n
---help--- ---help---

View File

@ -53,7 +53,7 @@ if WIMAX_GDM72XX_USB
config WIMAX_GDM72XX_USB_PM config WIMAX_GDM72XX_USB_PM
bool "Enable power management support" bool "Enable power management support"
depends on PM_RUNTIME depends on PM
help help
Enable USB power management in order to reduce power consumption Enable USB power management in order to reduce power consumption
while the interface is not in use. while the interface is not in use.

View File

@ -43,7 +43,7 @@ config USB_DYNAMIC_MINORS
config USB_OTG config USB_OTG
bool "OTG support" bool "OTG support"
depends on PM_RUNTIME depends on PM
default n default n
help help
The most notable feature of USB OTG is support for a The most notable feature of USB OTG is support for a

View File

@ -20,7 +20,7 @@ config AB8500_USB
config FSL_USB2_OTG config FSL_USB2_OTG
bool "Freescale USB OTG Transceiver Driver" bool "Freescale USB OTG Transceiver Driver"
depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM
select USB_OTG select USB_OTG
select USB_PHY select USB_PHY
help help
@ -153,7 +153,7 @@ config USB_MSM_OTG
config USB_MV_OTG config USB_MV_OTG
tristate "Marvell USB OTG support" tristate "Marvell USB OTG support"
depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME depends on USB_EHCI_MV && USB_MV_UDC && PM
select USB_OTG select USB_OTG
select USB_PHY select USB_PHY
help help

View File

@ -41,7 +41,7 @@ config USB_STORAGE_REALTEK
config REALTEK_AUTOPM config REALTEK_AUTOPM
bool "Realtek Card Reader autosuspend support" bool "Realtek Card Reader autosuspend support"
depends on USB_STORAGE_REALTEK && PM_RUNTIME depends on USB_STORAGE_REALTEK && PM
default y default y
config USB_STORAGE_DATAFAB config USB_STORAGE_DATAFAB