Commit 06e298b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge branch 'for-next/xceiv' of...

Merge branch 'for-next/xceiv' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

* 'for-next/xceiv' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: otg: trivial cleanups
parents 121a8cdd 00471f62
...@@ -82,9 +82,9 @@ config NOP_USB_XCEIV ...@@ -82,9 +82,9 @@ config NOP_USB_XCEIV
tristate "NOP USB Transceiver Driver" tristate "NOP USB Transceiver Driver"
select USB_OTG_UTILS select USB_OTG_UTILS
help help
this driver is to be used by all the usb transceiver which are either This driver is to be used by all the usb transceiver which are either
built-in with usb ip or which are autonomous and doesn't require any built-in with usb ip or which are autonomous and doesn't require any
phy programming such as ISP1x04 etc. phy programming such as ISP1x04 etc.
config USB_LANGWELL_OTG config USB_LANGWELL_OTG
tristate "Intel Langwell USB OTG dual-role support" tristate "Intel Langwell USB OTG dual-role support"
...@@ -114,13 +114,13 @@ config USB_MSM_OTG ...@@ -114,13 +114,13 @@ config USB_MSM_OTG
has an external PHY. has an external PHY.
config AB8500_USB config AB8500_USB
tristate "AB8500 USB Transceiver Driver" tristate "AB8500 USB Transceiver Driver"
depends on AB8500_CORE depends on AB8500_CORE
select USB_OTG_UTILS select USB_OTG_UTILS
help help
Enable this to support the USB OTG transceiver in AB8500 chip. Enable this to support the USB OTG transceiver in AB8500 chip.
This transceiver supports high and full speed devices plus, This transceiver supports high and full speed devices plus,
in host mode, low speed. in host mode, low speed.
config FSL_USB2_OTG config FSL_USB2_OTG
bool "Freescale USB OTG Transceiver Driver" bool "Freescale USB OTG Transceiver Driver"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment