From: Rafael J. Wysocki <[email protected]> After commit b2b49ccbdd54 (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 <[email protected]> --- Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) which is only in linux-next at the moment (via the linux-pm tree). Please let me know if it is OK to take this one into linux-pm. --- arch/arm/mach-exynos/Kconfig | 2 +- arch/ia64/Kconfig | 2 +- drivers/ata/Kconfig | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/s5p-tv/Kconfig | 2 +- drivers/staging/gdm72xx/Kconfig | 2 +- drivers/usb/core/Kconfig | 2 +- drivers/usb/phy/Kconfig | 4 ++-- drivers/usb/storage/Kconfig | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) Index: linux-pm/arch/arm/mach-exynos/Kconfig =================================================================== --- linux-pm.orig/arch/arm/mach-exynos/Kconfig +++ linux-pm/arch/arm/mach-exynos/Kconfig @@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS - select PM_GENERIC_DOMAINS if PM_RUNTIME + select PM_GENERIC_DOMAINS if PM select S5P_DEV_MFC select SRAM help Index: linux-pm/arch/ia64/Kconfig =================================================================== --- linux-pm.orig/arch/ia64/Kconfig +++ linux-pm/arch/ia64/Kconfig @@ -232,7 +232,7 @@ config IA64_SGI_UV config IA64_HP_SIM bool "Ski-simulator" select SWIOTLB - depends on !PM_RUNTIME + depends on !PM endchoice Index: linux-pm/drivers/ata/Kconfig =================================================================== --- linux-pm.orig/drivers/ata/Kconfig +++ linux-pm/drivers/ata/Kconfig @@ -61,7 +61,7 @@ config ATA_ACPI config SATA_ZPODD bool "SATA Zero Power Optical Disc Drive (ZPODD) support" - depends on ATA_ACPI && PM_RUNTIME + depends on ATA_ACPI && PM default n help This option adds support for SATA Zero Power Optical Disc Index: linux-pm/drivers/media/platform/Kconfig =================================================================== --- linux-pm.orig/drivers/media/platform/Kconfig +++ linux-pm/drivers/media/platform/Kconfig @@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" 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 HAS_DMA select VIDEOBUF2_DMA_CONTIG Index: linux-pm/drivers/media/platform/s5p-tv/Kconfig =================================================================== --- linux-pm.orig/drivers/media/platform/s5p-tv/Kconfig +++ linux-pm/drivers/media/platform/s5p-tv/Kconfig @@ -8,7 +8,7 @@ config VIDEO_SAMSUNG_S5P_TV bool "Samsung TV driver for S5P platform" - depends on PM_RUNTIME + depends on PM depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST default n ---help--- Index: linux-pm/drivers/staging/gdm72xx/Kconfig =================================================================== --- linux-pm.orig/drivers/staging/gdm72xx/Kconfig +++ linux-pm/drivers/staging/gdm72xx/Kconfig @@ -53,7 +53,7 @@ if WIMAX_GDM72XX_USB config WIMAX_GDM72XX_USB_PM bool "Enable power management support" - depends on PM_RUNTIME + depends on PM help Enable USB power management in order to reduce power consumption while the interface is not in use. Index: linux-pm/drivers/usb/core/Kconfig =================================================================== --- linux-pm.orig/drivers/usb/core/Kconfig +++ linux-pm/drivers/usb/core/Kconfig @@ -43,7 +43,7 @@ config USB_DYNAMIC_MINORS config USB_OTG bool "OTG support" - depends on PM_RUNTIME + depends on PM default n help The most notable feature of USB OTG is support for a Index: linux-pm/drivers/usb/phy/Kconfig =================================================================== --- linux-pm.orig/drivers/usb/phy/Kconfig +++ linux-pm/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB config FSL_USB2_OTG 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_PHY help @@ -153,7 +153,7 @@ config USB_MSM_OTG config USB_MV_OTG 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_PHY help Index: linux-pm/drivers/usb/storage/Kconfig =================================================================== --- linux-pm.orig/drivers/usb/storage/Kconfig +++ linux-pm/drivers/usb/storage/Kconfig @@ -41,7 +41,7 @@ config USB_STORAGE_REALTEK config REALTEK_AUTOPM bool "Realtek Card Reader autosuspend support" - depends on USB_STORAGE_REALTEK && PM_RUNTIME + depends on USB_STORAGE_REALTEK && PM default y config USB_STORAGE_DATAFAB -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
