From 8e48361409409592c2520d79c3e7b73a1d769472 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@linux01.gwdg.de>
Date: Thu, 10 May 2007 22:52:56 -0700
Subject: [PATCH] --- yaml --- r: 56223 b: refs/heads/master c:
 f30486d57bceec2364aa696403d64429ada61b60 h: refs/heads/master i:   56221:
 eaa60aa16101333cf7e4bfabc3c854baff85bf3a   56219:
 5b2b50b897eec374f5b59d2ecb33cac1fb76f1af   56215:
 3f67b9648361fc460445272a7452c7238cfa3fce   56207:
 9b65dd350b02a2c38030aee9774518ca7b8b4b00   56191:
 94a04c7741bef8a6ee758f9407a53f904fcbea23 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/Kconfig | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c0c8e09d6985..b27b91caf2db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f99941c1d0bd1d75c9ea7bf4dfcb3ce3ec4b05
+refs/heads/master: f30486d57bceec2364aa696403d64429ada61b60
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index fa489b10c38c..8a7f9e9fb8d8 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -1898,8 +1898,12 @@ endmenu
 #	Gigabit Ethernet
 #
 
-menu "Ethernet (1000 Mbit)"
+menuconfig NETDEV_1000
+	bool "Ethernet (1000 Mbit)"
 	depends on !UML
+	default y
+
+if NETDEV_1000
 
 config ACENIC
 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
@@ -2326,14 +2330,18 @@ config ATL1
 	  To compile this driver as a module, choose M here.  The module
 	  will be called atl1.
 
-endmenu
+endif # NETDEV_1000
 
 #
 #	10 Gigabit Ethernet
 #
 
-menu "Ethernet (10000 Mbit)"
+menuconfig NETDEV_10000
+	bool "Ethernet (10000 Mbit)"
 	depends on !UML
+	default y
+
+if NETDEV_10000
 
 config CHELSIO_T1
         tristate "Chelsio 10Gb Ethernet support"
@@ -2507,7 +2515,7 @@ config MLX4_DEBUG
 	  debug_level module parameter (which can also be set after
 	  the driver is loaded through sysfs).
 
-endmenu
+endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"