aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-12-06 10:03:02 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 11:55:26 -0800
commit5791e10341f8bf284bd16eb0949cbeed91c9dac8 (patch)
tree206412203507d6d145bfb6ad38dc25267560b5db /drivers/usb
parent8d87cacda7c8db5c131bfcaaa1d90bfe918c2ebc (diff)
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: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index df8b11d6c0f..ee411206c69 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -814,16 +814,17 @@ config USB_CDC_COMPOSITE
config USB_G_MULTI
tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
+ depends on BLOCK && NET
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
+ You will be asked to choose which of the two configurations is
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
- 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.
Say "y" to link the driver statically, or "m" to build a
@@ -836,8 +837,8 @@ config USB_G_MULTI_RNDIS
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.
+ Gadget. This is the configuration dedicated for Windows since RNDIS
+ is Microsoft's protocol.
If unsure, say "y".
@@ -848,8 +849,7 @@ config USB_G_MULTI_CDC
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.
+ Composite Gadget.
If unsure, say "y".