patch-2.4.0-test9 linux/drivers/net/Config.in

Next file: linux/drivers/net/Makefile
Previous file: linux/drivers/net/8390.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -151,17 +151,16 @@
 	 tristate '    Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
       fi
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-         tristate '    RealTek 8129 (not 8019/8029!) support (EXPERIMENTAL)' CONFIG_RTL8129
-      fi
-      tristate '    RealTek RTL-8139 PCI Fast Ethernet Adapter support' CONFIG_8139TOO
-      tristate '    SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900
-      # tristate '    Sundance Alta support' CONFIG_ALTA
-      tristate '    TI ThunderLAN support' CONFIG_TLAN
-      tristate '    VIA Rhine support' CONFIG_VIA_RHINE
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
 	 tristate '    Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
-	 tristate '    SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100
+         dep_tristate '    RealTek 8129 (not 8019/8029/8139!) support (EXPERIMENTAL)' CONFIG_RTL8129 $CONFIG_PCI
       fi
+      dep_tristate '    RealTek RTL-8139 PCI Fast Ethernet Adapter support' CONFIG_8139TOO $CONFIG_PCI
+      dep_tristate '    SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 $CONFIG_PCI
+      dep_tristate '    SMC EtherPower II' CONFIG_EPIC100 $CONFIG_PCI
+      dep_tristate '    Sundance Alta support' CONFIG_SUNDANCE $CONFIG_PCI
+      tristate '    TI ThunderLAN support' CONFIG_TLAN
+      dep_tristate '    VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
+      dep_tristate '    Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
       if [ "$CONFIG_OBSOLETE" = "y" ]; then
 	 bool '    Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
       fi
@@ -185,21 +184,21 @@
 mainmenu_option next_comment
 comment 'Ethernet (1000 Mbit)'
 
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   # tristate 'Packet Engines Hamachi GNIC-II support (EXPERIMENTAL)' CONFIG_HAMACHI
-   tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN
-fi
-tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC
+dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
 if [ "$CONFIG_ACENIC" != "n" ]; then
    bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
 fi
+dep_tristate 'Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI
+fi
 tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
 
 endmenu
 
 bool 'FDDI driver support' CONFIG_FDDI
 if [ "$CONFIG_FDDI" = "y" ]; then
-   tristate '  Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
+   dep_tristate '  Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX $CONFIG_PCI
    tristate '  SysKonnect FDDI PCI support' CONFIG_SKFP
 fi
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)