Skip to content

Commit

Permalink
usb: gadget: allow to enable legacy drivers without USB_ETH
Browse files Browse the repository at this point in the history
Considerable time ago the legacy gadget menu was added inside the
USB_ETH choice. I think this was a mistake and that the legacy
gadget menu should have been added after "endchoice" instead of
before. Hence this patch.

Fixes: commit 8443f2d ("usb: gadget: Gadget directory cleanup - group legacy gadgets")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  • Loading branch information
Bart Van Assche authored and Felipe Balbi committed Nov 28, 2017
1 parent a58204a commit 7a9618a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/gadget/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ choice
controller, and the relevant drivers for each function declared
by the device.

source "drivers/usb/gadget/legacy/Kconfig"

endchoice

source "drivers/usb/gadget/legacy/Kconfig"

endif # USB_GADGET
10 changes: 10 additions & 0 deletions drivers/usb/gadget/legacy/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
#

menuconfig USB_GADGET_LEGACY
bool "Legacy USB Gadget Support"
help
Legacy USB gadgets are USB gadgets that do not use the USB gadget
configfs interface.

if USB_GADGET_LEGACY

config USB_ZERO
tristate "Gadget Zero (DEVELOPMENT)"
select USB_LIBCOMPOSITE
Expand Down Expand Up @@ -490,3 +498,5 @@ config USB_G_WEBCAM

Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "g_webcam".

endif

0 comments on commit 7a9618a

Please sign in to comment.