USB: g_multi: Multifunction Composite Gadget added

[deliverable/linux.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 3bb250fd53216ee4863d998f4f77a33159c044e6..df8b11d6c0fe69637c1d51596dcf882767880719 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -812,6 +812,48 @@ config USB_CDC_COMPOSITE
          Say "y" to link the driver statically, or "m" to build a
          dynamically linked module.
 
+config USB_G_MULTI
+       tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
+       help
+         The Multifunction Composite Gadget provides Ethernet (RNDIS
+         and/or CDC Ethernet), mass storage and ACM serial link
+         interfaces.
+
+         You will be asked too choose which of the two configurations are
+         to be available in the gadget.  At least one configuration must
+         be choosen to make gadget usable.  Selecting more then one
+         configuration will prevent Windows from automatically detecting
+         the gadget as a composite gadget an INF file will be needed to
+         use the gadget.
+
+         Say "y" to link the driver statically, or "m" to build a
+         dynamically linked module called "g_multi".
+
+config USB_G_MULTI_RNDIS
+       bool "RNDIS + CDC Serial + Storage configuration"
+       depends on USB_G_MULTI
+       default y
+       help
+         This option enables a configuration with RNDIS, CDC Serial and
+         Mass Storage functions available in the Multifunction Composite
+         Gadget.  This is configuration dedicated for Windows since RNDIS
+         is Microsfot's protocol.
+
+         If unsure, say "y".
+
+config USB_G_MULTI_CDC
+       bool "CDC Ethernet + CDC Serial + Storage configuration"
+       depends on USB_G_MULTI
+       default n
+       help
+         This option enables a configuration with CDC Ethernet (ECM), CDC
+         Serial and Mass Storage functions available in the Multifunction
+         Composite Gadget.  This is configuration dedicated for Windows
+         since RNDIS is Microsfot's protocol.
+
+         If unsure, say "y".
+
+
 # put drivers that need isochronous transfer support (for audio
 # or video class gadget drivers), or specific hardware, here.