Skip to content

Commit

Permalink
Merge branch 'for-next/xceiv' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
Greg Kroah-Hartman committed Dec 22, 2011
2 parents 121a8cd + 00471f6 commit 06e298b
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/usb/otg/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ config NOP_USB_XCEIV
tristate "NOP USB Transceiver Driver"
select USB_OTG_UTILS
help
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
phy programming such as ISP1x04 etc.
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
phy programming such as ISP1x04 etc.

config USB_LANGWELL_OTG
tristate "Intel Langwell USB OTG dual-role support"
Expand Down Expand Up @@ -114,13 +114,13 @@ config USB_MSM_OTG
has an external PHY.

config AB8500_USB
tristate "AB8500 USB Transceiver Driver"
depends on AB8500_CORE
select USB_OTG_UTILS
help
Enable this to support the USB OTG transceiver in AB8500 chip.
This transceiver supports high and full speed devices plus,
in host mode, low speed.
tristate "AB8500 USB Transceiver Driver"
depends on AB8500_CORE
select USB_OTG_UTILS
help
Enable this to support the USB OTG transceiver in AB8500 chip.
This transceiver supports high and full speed devices plus,
in host mode, low speed.

config FSL_USB2_OTG
bool "Freescale USB OTG Transceiver Driver"
Expand Down

0 comments on commit 06e298b

Please sign in to comment.