aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Izard <romain.izard.pro@gmail.com>2017-03-10 08:11:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-20 08:28:35 -0400
commit5c51e4b65fca4648a57719ea6b0173261fe523ba (patch)
tree4f88c6bf7c6917df0b752fc83af60ffb86447a70
parentaf534bf9540e4684e95489f65eda1635932b8916 (diff)
usb: gadget: legacy gadgets are optional
commit 6e253d0fbc665b36192b8ed3cecdbb65b413a1eb upstream. With commit bc49d1d17dcf ("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: bc49d1d17dcf ("usb: gadget: don't couple configfs to legacy gadgets") Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8ad203296079..f3ee80ece682 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -460,6 +460,7 @@ config USB_CONFIGFS_F_TCM
460choice 460choice
461 tristate "USB Gadget Drivers" 461 tristate "USB Gadget Drivers"
462 default USB_ETH 462 default USB_ETH
463 optional
463 help 464 help
464 A Linux "Gadget Driver" talks to the USB Peripheral Controller 465 A Linux "Gadget Driver" talks to the USB Peripheral Controller
465 driver through the abstract "gadget" API. Some other operating 466 driver through the abstract "gadget" API. Some other operating