diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-01 11:45:33 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-01 11:45:33 -0500 |
| commit | 8062d94a545457a83d5291bd62c3bfd14200bba0 (patch) | |
| tree | a6a7aaaea5dff00f7415a93189720a1164ae30dd /drivers/usb/otg/Kconfig | |
| parent | 15e68a803573974409972e761d8f08f03fce5bdb (diff) | |
| parent | 6e13c6505cdff9766d5268ffb8c972c1a2f996e6 (diff) | |
Merge tag 'xceiv-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
USB: transceiver changes for 3.4
Here we have a big rework done by Heikki Krogerus (thanks) which
splits OTG functionality away from transceivers.
We have known for quite a long time that struct otg_transceiver was
a bad name for the structure, considering transceiver is far from
being OTG-specific (see 4e67185).
Diffstat (limited to 'drivers/usb/otg/Kconfig')
| -rw-r--r-- | drivers/usb/otg/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 735ef4c2339a..5c87db06b598 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig | |||
| @@ -23,7 +23,7 @@ config USB_GPIO_VBUS | |||
| 23 | select USB_OTG_UTILS | 23 | select USB_OTG_UTILS |
| 24 | help | 24 | help |
| 25 | Provides simple GPIO VBUS sensing for controllers with an | 25 | Provides simple GPIO VBUS sensing for controllers with an |
| 26 | internal transceiver via the otg_transceiver interface, and | 26 | internal transceiver via the usb_phy interface, and |
| 27 | optionally control of a D+ pullup GPIO as well as a VBUS | 27 | optionally control of a D+ pullup GPIO as well as a VBUS |
| 28 | current limit regulator. | 28 | current limit regulator. |
| 29 | 29 | ||