lkml.org 
[lkml]   [2009]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH -next resend] g_multi kconfig: fix depends and help text
From: Randy Dunlap <randy.dunlap@oracle.com>

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>
---
drivers/usb/gadget/Kconfig | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

--- linux-next-20091204.orig/drivers/usb/gadget/Kconfig
+++ linux-next-20091204/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".


\
 
 \ /
  Last update: 2009-12-06 20:09    [W:0.076 / U:5.588 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site