diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-12 18:19:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-12 18:19:53 -0500 |
commit | 007d00d4c11b30b8fd7ff23b9d5aed3743e41f74 (patch) | |
tree | d5c307ba2ee0e2f56fbc284db21b8bccf95d8a40 /drivers/usb/gadget/Kconfig | |
parent | c91043adaf50ef13609003120f3471783460fb71 (diff) | |
parent | 68d3e668d245bb8300c7c6ddbc8508ddfe352e0f (diff) |
Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (392 commits)
usb: dwc3: ep0: fix for possible early delayed_status
usb: dwc3: gadget: fix stream enable bit
usb: dwc3: ep0: fix GetStatus handling (again)
usb: dwc3: ep0: use dwc3_request for ep0 requsts instead of usb_request
usb: dwc3: use correct hwparam register for power mgm check
usb: dwc3: omap: move to module_platform_driver
usb: dwc3: workaround: missing disconnect event
usb: dwc3: workaround: missing USB3 Reset event
usb: dwc3: workaround: U1/U2 -> U0 transiton
usb: dwc3: gadget: return early in dwc3_cleanup_done_reqs()
usb: dwc3: ep0: handle delayed_status again
usb: dwc3: ep0: push ep0state into xfernotready processing
usb: dwc3: fix sparse errors
usb: dwc3: fix few coding style problems
usb: dwc3: move generic dwc3 code from gadget into core
usb: dwc3: use a helper function for operation mode setting
usb: dwc3: ep0: don't use ep0in for transfers
usb: dwc3: ep0: use proper endianess in SetFeature for wIndex
usb: dwc3: core: drop DWC3_EVENT_BUFFERS_MAX
usb: dwc3: omap: add multiple instances support to OMAP
...
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r-- | drivers/usb/gadget/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 3162a7da8724..71108c26c562 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -319,18 +319,6 @@ config USB_PXA_U2O | |||
319 | PXA9xx Processor series include a high speed USB2.0 device | 319 | PXA9xx Processor series include a high speed USB2.0 device |
320 | controller, which support high speed and full speed USB peripheral. | 320 | controller, which support high speed and full speed USB peripheral. |
321 | 321 | ||
322 | config USB_GADGET_DWC3 | ||
323 | tristate "DesignWare USB3.0 (DRD) Controller" | ||
324 | depends on USB_DWC3 | ||
325 | select USB_GADGET_DUALSPEED | ||
326 | select USB_GADGET_SUPERSPEED | ||
327 | help | ||
328 | DesignWare USB3.0 controller is a SuperSpeed USB3.0 Controller | ||
329 | which can be configured for peripheral-only, host-only, hub-only | ||
330 | and Dual-Role operation. This Controller was first integrated into | ||
331 | the OMAP5 series of processors. More information about the OMAP5 | ||
332 | version of this controller, refer to http://www.ti.com/omap5. | ||
333 | |||
334 | # | 322 | # |
335 | # Controllers available in both integrated and discrete versions | 323 | # Controllers available in both integrated and discrete versions |
336 | # | 324 | # |