diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:44:04 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:44:04 -0500 |
commit | 1b3e3aa6c5c7a86ae09459f5734283b991dd7939 (patch) | |
tree | 1abff2108fef3589053ff1eaf7169897675cc496 /drivers/usb | |
parent | bf7c5449e6240c510df5fafcffd8b7bfd9f8e831 (diff) |
PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
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 <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>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/phy/Kconfig | 4 | ||||
-rw-r--r-- | drivers/usb/storage/Kconfig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 9cfda6a72194..cc0ced08bae2 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig | |||
@@ -43,7 +43,7 @@ config USB_DYNAMIC_MINORS | |||
43 | 43 | ||
44 | config USB_OTG | 44 | config USB_OTG |
45 | bool "OTG support" | 45 | bool "OTG support" |
46 | depends on PM_RUNTIME | 46 | depends on PM |
47 | default n | 47 | default n |
48 | help | 48 | help |
49 | The most notable feature of USB OTG is support for a | 49 | The most notable feature of USB OTG is support for a |
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 0cd1f44f0ee8..c6d0c8e745b9 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig | |||
@@ -20,7 +20,7 @@ config AB8500_USB | |||
20 | 20 | ||
21 | config FSL_USB2_OTG | 21 | config FSL_USB2_OTG |
22 | bool "Freescale USB OTG Transceiver Driver" | 22 | bool "Freescale USB OTG Transceiver Driver" |
23 | depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME | 23 | depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM |
24 | select USB_OTG | 24 | select USB_OTG |
25 | select USB_PHY | 25 | select USB_PHY |
26 | help | 26 | help |
@@ -153,7 +153,7 @@ config USB_MSM_OTG | |||
153 | 153 | ||
154 | config USB_MV_OTG | 154 | config USB_MV_OTG |
155 | tristate "Marvell USB OTG support" | 155 | tristate "Marvell USB OTG support" |
156 | depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME | 156 | depends on USB_EHCI_MV && USB_MV_UDC && PM |
157 | select USB_OTG | 157 | select USB_OTG |
158 | select USB_PHY | 158 | select USB_PHY |
159 | help | 159 | help |
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 715f299af6ea..ec84758f0e23 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig | |||
@@ -41,7 +41,7 @@ config USB_STORAGE_REALTEK | |||
41 | 41 | ||
42 | config REALTEK_AUTOPM | 42 | config REALTEK_AUTOPM |
43 | bool "Realtek Card Reader autosuspend support" | 43 | bool "Realtek Card Reader autosuspend support" |
44 | depends on USB_STORAGE_REALTEK && PM_RUNTIME | 44 | depends on USB_STORAGE_REALTEK && PM |
45 | default y | 45 | default y |
46 | 46 | ||
47 | config USB_STORAGE_DATAFAB | 47 | config USB_STORAGE_DATAFAB |