From: Jeff Dike <jdike@addtoit.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net,
viro@zeniv.linux.org.uk
Subject: [uml-devel] [PATCH 6/10] Sanitize net Kconfigs
Date: Tue, 28 Mar 2006 18:00:12 -0500 [thread overview]
Message-ID: <200603282300.k2SN0C7n022987@ccure.user-mode-linux.org> (raw)
From: Al Viro <viro@zeniv.linux.org.uk>
uml: kconfig sanitized around drivers/net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
arch/um/Kconfig | 3 +++
drivers/net/Kconfig | 2 --
drivers/net/tokenring/Kconfig | 2 +-
drivers/net/wireless/Kconfig | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
Index: linux-2.6.16-mm/arch/um/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/arch/um/Kconfig 2006-03-23 16:40:20.000000000 -0500
+++ linux-2.6.16-mm/arch/um/Kconfig 2006-03-28 09:34:46.000000000 -0500
@@ -22,6 +22,9 @@ config SBUS
config PCI
bool
+config PCMCIA
+ bool
+
config GENERIC_CALIBRATE_DELAY
bool
default y
Index: linux-2.6.16-mm/drivers/net/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/Kconfig 2006-03-28 09:30:43.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/Kconfig 2006-03-28 09:34:46.000000000 -0500
@@ -2313,13 +2313,11 @@ config S2IO_NAPI
endmenu
-if !UML
source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig"
source "drivers/net/pcmcia/Kconfig"
-endif
source "drivers/net/wan/Kconfig"
Index: linux-2.6.16-mm/drivers/net/tokenring/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/tokenring/Kconfig 2006-03-28 09:30:43.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/tokenring/Kconfig 2006-03-28 09:34:46.000000000 -0500
@@ -3,7 +3,7 @@
#
menu "Token Ring devices"
- depends on NETDEVICES
+ depends on NETDEVICES && !UML
# So far, we only have PCI, ISA, and MCA token ring devices
config TR
Index: linux-2.6.16-mm/drivers/net/wireless/Kconfig
===================================================================
--- linux-2.6.16-mm.orig/drivers/net/wireless/Kconfig 2006-03-28 09:30:44.000000000 -0500
+++ linux-2.6.16-mm/drivers/net/wireless/Kconfig 2006-03-28 09:34:46.000000000 -0500
@@ -359,7 +359,7 @@ config PCI_HERMES
config ATMEL
tristate "Atmel at76c50x chipset 802.11b support"
- depends on NET_RADIO
+ depends on NET_RADIO && (PCI || PCMCIA)
select FW_LOADER
select CRC32
---help---
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
reply other threads:[~2006-03-28 22:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200603282300.k2SN0C7n022987@ccure.user-mode-linux.org \
--to=jdike@addtoit.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=viro@zeniv.linux.org.uk \
/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