Commit 5c51e4b6 authored by Romain Izard's avatar Romain Izard Committed by Greg Kroah-Hartman

usb: gadget: legacy gadgets are optional

commit 6e253d0f upstream.

With commit bc49d1d1 ("usb: gadget: don't couple configfs to legacy
gadgets"),it is possible to build a modular kernel with both built-in
configfs support and modular legacy gadget drivers.

But when building a kernel without modules, it is also necessary to be
able to build with configfs but without any legacy gadget driver. This
was a possible configuration when the USB_CONFIGFS was a part of the
choice options, but not anymore.

Mark the choice for legacy gadget drivers as optional restores this.

Fixes: bc49d1d1 ("usb: gadget: don't couple configfs to legacy gadgets")
Signed-off-by: default avatarRomain Izard <romain.izard.pro@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af534bf9
...@@ -460,6 +460,7 @@ config USB_CONFIGFS_F_TCM ...@@ -460,6 +460,7 @@ config USB_CONFIGFS_F_TCM
choice choice
tristate "USB Gadget Drivers" tristate "USB Gadget Drivers"
default USB_ETH default USB_ETH
optional
help help
A Linux "Gadget Driver" talks to the USB Peripheral Controller A Linux "Gadget Driver" talks to the USB Peripheral Controller
driver through the abstract "gadget" API. Some other operating driver through the abstract "gadget" API. Some other operating
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment