Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303872
b: refs/heads/master
c: ed6c6f4
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Shishkin authored and Greg Kroah-Hartman committed May 9, 2012
1 parent b70ed04 commit f3351a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 262c16320a915c26c927c9f7ddb0e1fe42fa0267
refs/heads/master: ed6c6f419f02a6da444e26374f3510ac57b6faf4
10 changes: 2 additions & 8 deletions trunk/drivers/usb/gadget/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,7 @@ config USB_GADGET_STORAGE_NUM_BUFFERS
# - discrete ones (including all PCI-only controllers)
# - debug/dummy gadget+hcd is last.
#
choice
prompt "USB Peripheral Controller"
help
A USB device uses a controller to talk to its host.
Systems should have only one such upstream link.
Many controller drivers are platform-specific; these
often need board-specific hooks.
menu "USB Peripheral Controller"

#
# Integrated controllers
Expand Down Expand Up @@ -536,7 +530,7 @@ config USB_DUMMY_HCD
# NOTE: Please keep dummy_hcd LAST so that "real hardware" appears
# first and will be selected by default.

endchoice
endmenu

# Selected by UDC drivers that support high-speed operation.
config USB_GADGET_DUALSPEED
Expand Down

0 comments on commit f3351a2

Please sign in to comment.