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

Next file: linux/drivers/net/Space.c
Previous file: linux/drivers/net/82596.c
Back to the patch index
Back to the overall index
Lines: 146
Date: Thu Nov 16 12:51:28 2000
Orig file: v2.4.0-test10/linux/drivers/net/Config.in
Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -60,23 +60,23 @@
    fi
    bool '  3COM cards' CONFIG_NET_VENDOR_3COM
    if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
-      tristate '    3c501 "EtherLink" support' CONFIG_EL1
-      tristate '    3c503 "EtherLink II" support' CONFIG_EL2
-      tristate '    3c505 "EtherLink Plus" support' CONFIG_ELPLUS
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    3c507 "EtherLink 16" support (EXPERIMENTAL)' CONFIG_EL16
+      dep_tristate '    3c501 "EtherLink" support' CONFIG_EL1 $CONFIG_ISA
+      dep_tristate '    3c503 "EtherLink II" support' CONFIG_EL2 $CONFIG_ISA
+      dep_tristate '    3c505 "EtherLink Plus" support' CONFIG_ELPLUS $CONFIG_ISA
+      dep_tristate '    3c507 "EtherLink 16" support (EXPERIMENTAL)' CONFIG_EL16 $CONFIG_ISA $CONFIG_EXPERIMENTAL
+      if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
+         tristate '    3c509/3c529 (MCA)/3c579 "EtherLink III" support' CONFIG_EL3
+      fi
+      if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" ]; then
+         tristate '    3c515 ISA "Fast EtherLink"' CONFIG_3C515
+      fi
+      dep_tristate '    3c523 "EtherLink/MC" support' CONFIG_ELMC $CONFIG_MCA
+      dep_tristate '    3c527 "EtherLink/MC 32" support (EXPERIMENTAL)' CONFIG_ELMC_II $CONFIG_MCA $CONFIG_EXPERIMENTAL
+      if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+         tristate '    3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
       fi
-      tristate '    3c509/3c529 (MCA)/3c579 "EtherLink III" support' CONFIG_EL3
-      tristate '    3c515 ISA "Fast EtherLink"' CONFIG_3C515
-      if [ "$CONFIG_MCA" = "y" ]; then
-	 tristate '    3c523 "EtherLink/MC" support' CONFIG_ELMC
-	 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	    tristate '    3c527 "EtherLink/MC 32" support (EXPERIMENTAL)' CONFIG_ELMC_II
-	 fi
-      fi
-      tristate '    3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
    fi
-   tristate '  AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
+   dep_tristate '  AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE $CONFIG_ISA
    bool '  Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
    if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then
       tristate '    WD80*3 support' CONFIG_WD80x3
@@ -84,23 +84,23 @@
 	 tristate '    SMC Ultra MCA support' CONFIG_ULTRAMCA
       fi
       tristate '    SMC Ultra support' CONFIG_ULTRA
-      tristate '    SMC Ultra32 EISA support' CONFIG_ULTRA32
+      dep_tristate '    SMC Ultra32 EISA support' CONFIG_ULTRA32 $CONFIG_EISA
       tristate '    SMC 9194 support' CONFIG_SMC9194
-  fi
-  bool '  Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
-  if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
-    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-      tristate '    NI5010 support (EXPERIMENTAL)' CONFIG_NI5010
-    fi
-    tristate '    NI5210 support' CONFIG_NI52
-    tristate '    NI6510 support' CONFIG_NI65
-  fi
+   fi
+   bool '  Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
+   if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
+      dep_tristate '    NI5010 support (EXPERIMENTAL)' CONFIG_NI5010 $CONFIG_EXPERIMENTAL
+      tristate '    NI5210 support' CONFIG_NI52
+      tristate '    NI6510 support' CONFIG_NI65
+   fi
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate '  AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700
    fi
    tristate '  DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
-   tristate '  HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
-   bool '  Other ISA cards' CONFIG_NET_ISA
+   if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
+      tristate '  HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
+   fi
+   dep_bool '  Other ISA cards' CONFIG_NET_ISA $CONFIG_ISA
    if [ "$CONFIG_NET_ISA" = "y" ]; then
       tristate '    Cabletron E21xx support' CONFIG_E2100
       if [ "$CONFIG_OBSOLETE" = "y" ]; then
@@ -127,52 +127,45 @@
    fi
    bool '  EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
    if [ "$CONFIG_NET_PCI" = "y" ]; then
-      tristate '    AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
+      dep_tristate '    AMD PCnet32 PCI support' CONFIG_PCNET32 $CONFIG_PCI
       dep_tristate '    Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE $CONFIG_PCI $CONFIG_EXPERIMENTAL
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
+      if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" ]; then
+	 dep_tristate '    Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200 $CONFIG_EXPERIMENTAL
       fi
 
       tristate '    Apricot Xen-II on board Ethernet' CONFIG_APRICOT
-      tristate '    CS89x0 support' CONFIG_CS89x0
-      tristate '    Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+      dep_tristate '    CS89x0 support' CONFIG_CS89x0 $CONFIG_ISA
       dep_tristate '    DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP $CONFIG_PCI
-      tristate '    Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-         tristate '    DM9102 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_DM9102
+      if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+         tristate '    Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+         tristate '    Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
       fi
+      dep_tristate '    DM9102 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_DM9102 $CONFIG_PCI $CONFIG_EXPERIMENTAL
       dep_tristate '    EtherExpressPro/100 support' CONFIG_EEPRO100 $CONFIG_PCI
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-         if [ "$CONFIG_EEPRO100" = "y" -o "$CONFIG_EEPRO100" = "m" ]; then
-	    bool '      Enable Power Management (EXPERIMENTAL)' CONFIG_EEPRO100_PM
-	 fi
-	 tristate '    Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
-      fi
+      dep_mbool '      Enable Power Management (EXPERIMENTAL)' CONFIG_EEPRO100_PM $CONFIG_EEPRO100 $CONFIG_EXPERIMENTAL
+      dep_tristate '    Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 $CONFIG_EISA $CONFIG_EXPERIMENTAL
       dep_tristate '    National Semiconductor DP83810 series PCI Ethernet support' CONFIG_NATSEMI $CONFIG_PCI
       dep_tristate '    PCI NE2000 and clones support (see help)' CONFIG_NE2K_PCI $CONFIG_PCI
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
-      fi
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
-         dep_tristate '    RealTek 8129 (not 8019/8029/8139!) support (EXPERIMENTAL)' CONFIG_RTL8129 $CONFIG_PCI
-      fi
+      dep_tristate '    Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
+      dep_tristate '    Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
       dep_tristate '    RealTek RTL-8139 PCI Fast Ethernet Adapter support' CONFIG_8139TOO $CONFIG_PCI
+      dep_tristate '    RealTek 8129 (not 8019/8029/8139!) support (EXPERIMENTAL)' CONFIG_RTL8129 $CONFIG_PCI $CONFIG_EXPERIMENTAL
       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
+      if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+         tristate '    TI ThunderLAN support' CONFIG_TLAN
+      fi
       dep_tristate '    VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
       dep_tristate '    Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
+      dep_tristate '    Sun Happy Meal 10/100baseT PCI support' CONFIG_HAPPYMEAL $CONFIG_PCI
       if [ "$CONFIG_OBSOLETE" = "y" ]; then
 	 bool '    Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
       fi
    fi
    bool '  Pocket and portable adapters' CONFIG_NET_POCKET
    if [ "$CONFIG_NET_POCKET" = "y" ]; then
-      if [ "$CONFIG_X86" = "y" ]; then
-         tristate '    AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
-      fi
+      dep_tristate '    AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP $CONFIG_ISA
       tristate '    D-Link DE600 pocket adapter support' CONFIG_DE600
       tristate '    D-Link DE620 pocket adapter support' CONFIG_DE620
    fi
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)