Merge remote-tracking branch 'usb/usb-next'

[deliverable/linux.git] / drivers / usb / core / Kconfig

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index dd280108758f3aff975f25653119d107b1e6cc3a..d6e43ce9679945d791a6442279b5c2ebfc97dd77 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -82,24 +82,3 @@ config USB_OTG_FSM
        help
          Implements OTG Finite State Machine as specified in On-The-Go
          and Embedded Host Supplement to the USB Revision 2.0 Specification.
-
-config USB_ULPI_BUS
-       tristate "USB ULPI PHY interface support"
-       depends on USB_SUPPORT
-       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.