aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/Kconfig
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-05-01 12:13:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-15 13:44:44 -0400
commit98f541c6e390d48643047e0924da8ccc10bb1598 (patch)
treef315f9e5028c38f2ac61700bb904089208e7b82a /drivers/usb/phy/Kconfig
parent815fa7b917614261748d1ecd9600ff27f99508e5 (diff)
USB: remove remaining instances of USB_SUSPEND
Commit 84ebc10294a3d7be4c66f51070b7aedbaa24de9b (USB: remove CONFIG_USB_SUSPEND option) failed to remove all of the usages of USB_SUSPEND throughout the kernel. This patch (as1677) removes the remaining instances of that symbol. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy/Kconfig')
-rw-r--r--drivers/usb/phy/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 5053cea0ad89..7ef3eb8617a6 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -25,7 +25,7 @@ config AB8500_USB
25 25
26config FSL_USB2_OTG 26config FSL_USB2_OTG
27 bool "Freescale USB OTG Transceiver Driver" 27 bool "Freescale USB OTG Transceiver Driver"
28 depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_SUSPEND 28 depends on USB_EHCI_FSL && USB_FSL_USB2 && PM_RUNTIME
29 select USB_OTG 29 select USB_OTG
30 help 30 help
31 Enable this to support Freescale USB OTG transceiver. 31 Enable this to support Freescale USB OTG transceiver.
@@ -161,7 +161,7 @@ config USB_MSM_OTG
161 161
162config USB_MV_OTG 162config USB_MV_OTG
163 tristate "Marvell USB OTG support" 163 tristate "Marvell USB OTG support"
164 depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND 164 depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
165 select USB_OTG 165 select USB_OTG
166 help 166 help
167 Say Y here if you want to build Marvell USB OTG transciever 167 Say Y here if you want to build Marvell USB OTG transciever