aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-12-22 16:58:59 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-22 16:59:05 -0500
commit06e298b46417bc729b996396a068daf462e2ab62 (patch)
tree472d28ef5040c1c1dd033452c0cc20c0f7b0ad97 /drivers/usb/otg
parent121a8cdd79e2c68ae78c7633f2a46ee65a177ff6 (diff)
parent00471f629e72e6b52efd01707decc418478e46df (diff)
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
Diffstat (limited to 'drivers/usb/otg')
-rw-r--r--drivers/usb/otg/Kconfig20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index c66481ad98d7..5e913d72cdab 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -82,9 +82,9 @@ config NOP_USB_XCEIV
82 tristate "NOP USB Transceiver Driver" 82 tristate "NOP USB Transceiver Driver"
83 select USB_OTG_UTILS 83 select USB_OTG_UTILS
84 help 84 help
85 this driver is to be used by all the usb transceiver which are either 85 This driver is to be used by all the usb transceiver which are either
86 built-in with usb ip or which are autonomous and doesn't require any 86 built-in with usb ip or which are autonomous and doesn't require any
87 phy programming such as ISP1x04 etc. 87 phy programming such as ISP1x04 etc.
88 88
89config USB_LANGWELL_OTG 89config USB_LANGWELL_OTG
90 tristate "Intel Langwell USB OTG dual-role support" 90 tristate "Intel Langwell USB OTG dual-role support"
@@ -114,13 +114,13 @@ config USB_MSM_OTG
114 has an external PHY. 114 has an external PHY.
115 115
116config AB8500_USB 116config AB8500_USB
117 tristate "AB8500 USB Transceiver Driver" 117 tristate "AB8500 USB Transceiver Driver"
118 depends on AB8500_CORE 118 depends on AB8500_CORE
119 select USB_OTG_UTILS 119 select USB_OTG_UTILS
120 help 120 help
121 Enable this to support the USB OTG transceiver in AB8500 chip. 121 Enable this to support the USB OTG transceiver in AB8500 chip.
122 This transceiver supports high and full speed devices plus, 122 This transceiver supports high and full speed devices plus,
123 in host mode, low speed. 123 in host mode, low speed.
124 124
125config FSL_USB2_OTG 125config FSL_USB2_OTG
126 bool "Freescale USB OTG Transceiver Driver" 126 bool "Freescale USB OTG Transceiver Driver"