Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b3e3aa6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / Kconfig: Replace PM_RUNTIME with PM in dependencies 



After commit b2b49ccb (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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
parent bf7c5449

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

	select MFD_SYSCON

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/ata/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/platform/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/platform/s5p-tv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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---