Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-drm-fsl-dcu.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 08e594d495d71c2ca6cd9d4ab8b4edf616a86cf8..fb99cd445504859f16c027475863059302ac70d2 100644 (file)
--- a/drivers/net/Kconfig
+++ b/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"