Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5791e103 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

USB: g_multi kconfig: fix depends and help text 



USB_G_MULTI uses block and net interface functions, so make it
depend on both of those.  Otherwise there are lots of build errors.

Fix USB_G_MULTI config help text typos and copy/paste error.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8d87cacd

drivers/usb/gadget/Kconfig

+7 −7
Original line number Original line Diff line number Diff line
@@ -814,16 +814,17 @@ config USB_CDC_COMPOSITE 




config USB_G_MULTI

config USB_G_MULTI

	tristate "Multifunction Composite Gadget (EXPERIMENTAL)"

	tristate "Multifunction Composite Gadget (EXPERIMENTAL)"

	depends on BLOCK && NET

	help

	help

	  The Multifunction Composite Gadget provides Ethernet (RNDIS

	  The Multifunction Composite Gadget provides Ethernet (RNDIS

	  and/or CDC Ethernet), mass storage and ACM serial link

	  and/or CDC Ethernet), mass storage and ACM serial link

	  interfaces.

	  interfaces.





	  You will be asked too choose which of the two configurations are

	  You will be asked to choose which of the two configurations is

	  to be available in the gadget.  At least one configuration must

	  to be available in the gadget.  At least one configuration must

	  be choosen to make gadget usable.  Selecting more then one

	  be chosen to make the gadget usable.  Selecting more than one

	  configuration will prevent Windows from automatically detecting

	  configuration will prevent Windows from automatically detecting

	  the gadget as a composite gadget an INF file will be needed to

	  the gadget as a composite gadget, so an INF file will be needed to

	  use the gadget.

	  use the gadget.





	  Say "y" to link the driver statically, or "m" to build a

	  Say "y" to link the driver statically, or "m" to build a
@@ -836,8 +837,8 @@ config USB_G_MULTI_RNDIS 
	help

	help

	  This option enables a configuration with RNDIS, CDC Serial and

	  This option enables a configuration with RNDIS, CDC Serial and

	  Mass Storage functions available in the Multifunction Composite

	  Mass Storage functions available in the Multifunction Composite

	  Gadget.  This is configuration dedicated for Windows since RNDIS

	  Gadget.  This is the configuration dedicated for Windows since RNDIS

	  is Microsfot's protocol.

	  is Microsoft's protocol.





	  If unsure, say "y".

	  If unsure, say "y".
@@ -848,8 +849,7 @@ config USB_G_MULTI_CDC 
	help

	help

	  This option enables a configuration with CDC Ethernet (ECM), CDC

	  This option enables a configuration with CDC Ethernet (ECM), CDC

	  Serial and Mass Storage functions available in the Multifunction

	  Serial and Mass Storage functions available in the Multifunction

	  Composite Gadget.  This is configuration dedicated for Windows

	  Composite Gadget.

	  since RNDIS is Microsfot's protocol.





	  If unsure, say "y".

	  If unsure, say "y".