Merge tag 'usb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-block.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 73d233d3bf4d495df4a4ee9a270c2941fd4715ab..79b2e79dddd0674b83d0406c41edb183dc85557e 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -287,12 +287,6 @@ config USB_EHCI_MV
          Dova, Armada 370 and Armada XP. See "Support for Marvell EBU
          on-chip EHCI USB controller" for those.
 
-config USB_W90X900_EHCI
-       tristate "W90X900(W90P910) EHCI support"
-       depends on ARCH_W90X900
-       ---help---
-               Enables support for the W90X900 USB controller
-
 config USB_CNS3XXX_EHCI
        bool "Cavium CNS3XXX EHCI Module (DEPRECATED)"
        depends on ARCH_CNS3XXX
@@ -718,32 +712,6 @@ config USB_RENESAS_USBHS_HCD
          To compile this driver as a module, choose M here: the
          module will be called renesas-usbhs.
 
-config USB_WHCI_HCD
-       tristate "Wireless USB Host Controller Interface (WHCI) driver"
-       depends on USB_PCI && USB && UWB
-       select USB_WUSB
-       select UWB_WHCI
-       help
-         A driver for PCI-based Wireless USB Host Controllers that are
-         compliant with the WHCI specification.
-
-         To compile this driver a module, choose M here: the module
-         will be called "whci-hcd".
-
-config USB_HWA_HCD
-       tristate "Host Wire Adapter (HWA) driver"
-       depends on USB && UWB
-       select USB_WUSB
-       select UWB_HWA
-       help
-         This driver enables you to connect Wireless USB devices to
-         your system using a Host Wire Adaptor USB dongle. This is an
-         UWB Radio Controller and WUSB Host Controller connected to
-         your machine via USB (specified in WUSB1.0).
-
-         To compile this driver a module, choose M here: the module
-         will be called "hwa-hc".
-
 config USB_IMX21_HCD
        tristate "i.MX21 HCD support"
        depends on ARM && ARCH_MXC