From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, gregkh@suse.de
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
lud <linux-usb@vger.kernel.org>
Subject: [PATCH -next resend] g_multi kconfig: fix depends and help text
Date: Sun, 6 Dec 2009 10:03:02 -0800 [thread overview]
Message-ID: <20091206100302.f710f626.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20091204203014.e8ee54ca.sfr@canb.auug.org.au>
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".
next prev parent reply other threads:[~2009-12-06 19:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 9:30 linux-next: Tree for December 4 Stephen Rothwell
2009-12-04 9:44 ` Michal Simek
2009-12-04 10:44 ` Stephen Rothwell
2009-12-06 18:00 ` [PATCH -next resend] staging: vt6x depends on WLAN Randy Dunlap
2009-12-06 18:03 ` Randy Dunlap [this message]
2009-12-06 18:04 ` [PATCH -next resend/fixed] media/miro: fix kconfig depends/select Randy Dunlap
2009-12-06 18:12 ` linux-next: Tree for December 4 (staging/iio) Randy Dunlap
2009-12-07 15:19 ` [PATCH] Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed Jonathan Cameron
2009-12-07 17:07 ` Randy Dunlap
2009-12-06 22:27 ` linux-next: Tree for December 4 (comedi) Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091206100302.f710f626.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).