diff options
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index df8b11d6c0fe..ee411206c699 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -814,16 +814,17 @@ config USB_CDC_COMPOSITE | |||
| 814 | 814 | ||
| 815 | config USB_G_MULTI | 815 | config USB_G_MULTI |
| 816 | tristate "Multifunction Composite Gadget (EXPERIMENTAL)" | 816 | tristate "Multifunction Composite Gadget (EXPERIMENTAL)" |
| 817 | depends on BLOCK && NET | ||
| 817 | help | 818 | help |
| 818 | The Multifunction Composite Gadget provides Ethernet (RNDIS | 819 | The Multifunction Composite Gadget provides Ethernet (RNDIS |
| 819 | and/or CDC Ethernet), mass storage and ACM serial link | 820 | and/or CDC Ethernet), mass storage and ACM serial link |
| 820 | interfaces. | 821 | interfaces. |
| 821 | 822 | ||
| 822 | You will be asked too choose which of the two configurations are | 823 | You will be asked to choose which of the two configurations is |
| 823 | to be available in the gadget. At least one configuration must | 824 | to be available in the gadget. At least one configuration must |
| 824 | be choosen to make gadget usable. Selecting more then one | 825 | be chosen to make the gadget usable. Selecting more than one |
| 825 | configuration will prevent Windows from automatically detecting | 826 | configuration will prevent Windows from automatically detecting |
| 826 | the gadget as a composite gadget an INF file will be needed to | 827 | the gadget as a composite gadget, so an INF file will be needed to |
| 827 | use the gadget. | 828 | use the gadget. |
| 828 | 829 | ||
| 829 | Say "y" to link the driver statically, or "m" to build a | 830 | Say "y" to link the driver statically, or "m" to build a |
| @@ -836,8 +837,8 @@ config USB_G_MULTI_RNDIS | |||
| 836 | help | 837 | help |
| 837 | This option enables a configuration with RNDIS, CDC Serial and | 838 | This option enables a configuration with RNDIS, CDC Serial and |
| 838 | Mass Storage functions available in the Multifunction Composite | 839 | Mass Storage functions available in the Multifunction Composite |
| 839 | Gadget. This is configuration dedicated for Windows since RNDIS | 840 | Gadget. This is the configuration dedicated for Windows since RNDIS |
| 840 | is Microsfot's protocol. | 841 | is Microsoft's protocol. |
| 841 | 842 | ||
| 842 | If unsure, say "y". | 843 | If unsure, say "y". |
| 843 | 844 | ||
| @@ -848,8 +849,7 @@ config USB_G_MULTI_CDC | |||
| 848 | help | 849 | help |
| 849 | This option enables a configuration with CDC Ethernet (ECM), CDC | 850 | This option enables a configuration with CDC Ethernet (ECM), CDC |
| 850 | Serial and Mass Storage functions available in the Multifunction | 851 | Serial and Mass Storage functions available in the Multifunction |
| 851 | Composite Gadget. This is configuration dedicated for Windows | 852 | Composite Gadget. |
| 852 | since RNDIS is Microsfot's protocol. | ||
| 853 | 853 | ||
| 854 | If unsure, say "y". | 854 | If unsure, say "y". |
| 855 | 855 | ||