1 files changed, 21 insertions, 14 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3f1431d37e1c..d6bb128ce21e 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -95,6 +95,11 @@ config USB_EHCI_TT_NEWSCHED
 
           If unsure, say Y.
 
+config USB_EHCI_PCI
+        tristate
+        depends on USB_EHCI_HCD && PCI
+        default y
+
 config USB_EHCI_HCD_PMC_MSP
         tristate "EHCI support for on-chip PMC MSP71xx USB controller"
         depends on USB_EHCI_HCD && MSP_HAS_USB
@@ -215,9 +220,13 @@ config USB_W90X900_EHCI
                 Enables support for the W90X900 USB controller
 
 config USB_CNS3XXX_EHCI
-        bool "Cavium CNS3XXX EHCI Module"
+        bool "Cavium CNS3XXX EHCI Module (DEPRECATED)"
         depends on USB_EHCI_HCD && ARCH_CNS3XXX
+        select USB_EHCI_HCD_PLATFORM
         ---help---
+          This option is deprecated now and the driver was removed, use
+          USB_EHCI_HCD_PLATFORM instead.
+
           Enable support for the CNS3XXX SOC's on-chip EHCI controller.
           It is needed for high-speed (480Mbit/sec) USB 2.0 device
           support.
@@ -333,16 +342,6 @@ config USB_OHCI_ATH79
           Enables support for the built-in OHCI controller present on the
           Atheros AR71XX/AR7240 SoCs.
 
-config USB_OHCI_HCD_PPC_SOC
-        bool "OHCI support for on-chip PPC USB controller"
-        depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
-        default y
-        select USB_OHCI_BIG_ENDIAN_DESC
-        select USB_OHCI_BIG_ENDIAN_MMIO
-        ---help---
-          Enables support for the USB controller on the MPC52xx or
-          STB03xxx processor chip.  If unsure, say Y.
-
 config USB_OHCI_HCD_PPC_OF_BE
         bool "OHCI support for OF platform bus (big endian)"
         depends on USB_OHCI_HCD && PPC_OF
@@ -393,9 +392,13 @@ config USB_OHCI_HCD_SSB
           If unsure, say N.
 
 config USB_OHCI_SH
-        bool "OHCI support for SuperH USB controller"
+        bool "OHCI support for SuperH USB controller (DEPRECATED)"
         depends on USB_OHCI_HCD && SUPERH
+        select USB_OHCI_HCD_PLATFORM
         ---help---
+          This option is deprecated now and the driver was removed, use
+          USB_OHCI_HCD_PLATFORM instead.
+
           Enables support for the on-chip OHCI controller on the SuperH.
           If you use the PCI OHCI controller, this option is not necessary.
 
@@ -406,9 +409,13 @@ config USB_OHCI_EXYNOS
          Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
 
 config USB_CNS3XXX_OHCI
-        bool "Cavium CNS3XXX OHCI Module"
+        bool "Cavium CNS3XXX OHCI Module (DEPRECATED)"
         depends on USB_OHCI_HCD && ARCH_CNS3XXX
+        select USB_OHCI_HCD_PLATFORM
         ---help---
+          This option is deprecated now and the driver was removed, use
+          USB_OHCI_HCD_PLATFORM instead.
+
           Enable support for the CNS3XXX SOC's on-chip OHCI controller.
           It is needed for low-speed USB 1.0 device support.
 
@@ -423,7 +430,7 @@ config USB_OHCI_HCD_PLATFORM
           If unsure, say N.
 
 config USB_EHCI_HCD_PLATFORM
-        bool "Generic EHCI driver for a platform device"
+        tristate "Generic EHCI driver for a platform device"
         depends on USB_EHCI_HCD
         default n
         ---help---