Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 6e59d37..275568a 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -36,8 +36,7 @@ menuconfig USB_SUPPORT
 
 if USB_SUPPORT
 
-config USB_COMMON
-       tristate
+source "drivers/usb/common/Kconfig"
 
 config USB_ARCH_HAS_HCD
        def_bool y
@@ -98,8 +97,6 @@ source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/mon/Kconfig"
 
-source "drivers/usb/wusbcore/Kconfig"
-
 source "drivers/usb/host/Kconfig"
 
 source "drivers/usb/renesas_usbhs/Kconfig"
@@ -114,6 +111,8 @@ source "drivers/usb/usbip/Kconfig"
 
 endif
 
+source "drivers/usb/cdns3/Kconfig"
+
 source "drivers/usb/mtu3/Kconfig"
 
 source "drivers/usb/musb/Kconfig"
@@ -175,36 +174,4 @@ source "drivers/usb/typec/Kconfig"
 
 source "drivers/usb/roles/Kconfig"
 
-config USB_LED_TRIG
-       bool "USB LED Triggers"
-       depends on LEDS_CLASS && LEDS_TRIGGERS
-       select USB_COMMON
-       help
-         This option adds LED triggers for USB host and/or gadget activity.
-
-         Say Y here if you are working on a system with led-class supported
-         LEDs and you want to use them as activity indicators for USB host or
-         gadget.
-
-config USB_ULPI_BUS
-       tristate "USB ULPI PHY interface support"
-       select USB_COMMON
-       help
-         UTMI+ Low Pin Interface (ULPI) is specification for a commonly used
-         USB 2.0 PHY interface. The ULPI specification defines a standard set
-         of registers that can be used to detect the vendor and product which
-         allows ULPI to be handled as a bus. This module is the driver for that
-         bus.
-
-         The ULPI interfaces (the buses) are registered by the drivers for USB
-         controllers which support ULPI register access and have ULPI PHY
-         attached to them. The ULPI PHY drivers themselves are normal PHY
-         drivers.
-
-         ULPI PHYs provide often functions such as ADP sensing/probing (OTG
-         protocol) and USB charger detection.
-
-         To compile this driver as a module, choose M here: the module will
-         be called ulpi.
-
 endif # USB_SUPPORT