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

• Lines: 86
• Date: Fri Jun 23 21:06:58 2000
• Orig file: v2.4.0-test1/linux/drivers/net/Config.in
• Orig date: Tue May 23 15:31:35 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -49,7 +49,7 @@
       tristate '  MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC
    fi
    if [ "$CONFIG_SGI_IP27" = "y" ]; then
-      bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
+      bool '  SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
    fi
    if [ "$CONFIG_SUPERH" = "y" -a "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
       tristate '  National DP83902AV  support' CONFIG_STNIC
@@ -60,14 +60,14 @@
       tristate '    3c503 "EtherLink II" support' CONFIG_EL2
       tristate '    3c505 "EtherLink Plus" support' CONFIG_ELPLUS
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    3c507 support (EXPERIMENTAL)' CONFIG_EL16
+	 tristate '    3c507 "EtherLink 16" support (EXPERIMENTAL)' CONFIG_EL16
       fi
       tristate '    3c509/3c529 (MCA)/3c579 "EtherLink III" support' CONFIG_EL3
-      tristate '    3c515 ISA Fast EtherLink' CONFIG_3C515
+      tristate '    3c515 ISA "Fast EtherLink"' CONFIG_3C515
       if [ "$CONFIG_MCA" = "y" ]; then
-	 tristate '    3c523 EtherLinkMC support' CONFIG_ELMC
+	 tristate '    3c523 "EtherLink/MC" support' CONFIG_ELMC
 	 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	    tristate '    3c527 EtherLink/MC 32 support (EXPERIMENTAL)' CONFIG_ELMC_II
+	    tristate '    3c527 "EtherLink/MC 32" support (EXPERIMENTAL)' CONFIG_ELMC_II
 	 fi
       fi
       tristate '    3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
@@ -104,7 +104,7 @@
          tristate '    EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
       fi
       tristate '    EtherExpress 16 support' CONFIG_EEXPRESS
-      tristate '    EtherExpressPro support' CONFIG_EEXPRESS_PRO
+      tristate '    EtherExpressPro support/EtherExpress 10 (i82595) support' CONFIG_EEXPRESS_PRO
       if [ "$CONFIG_OBSOLETE" = "y" ]; then
          tristate '    FMV-181/182/183/184 support' CONFIG_FMV18X
       fi
@@ -121,6 +121,7 @@
    if [ "$CONFIG_MCA" = "y" ]; then
       tristate '  SKnet MCA support' CONFIG_SKMC
       tristate '  NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
+      tristate '  IBM LAN Adapter/A support' CONFIG_IBMLANA
    fi
    bool '  EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
    if [ "$CONFIG_NET_PCI" = "y" ]; then
@@ -182,20 +183,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
-    if [ "$CONFIG_ACENIC" != "n" ]; then
-      bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
-    fi
-    tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
+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
+if [ "$CONFIG_ACENIC" != "n" ]; then
+   bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+fi
+tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
+
 endmenu
 
 bool 'FDDI driver support' CONFIG_FDDI
 if [ "$CONFIG_FDDI" = "y" ]; then
-   dep_tristate '  Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX $CONFIG_FDDI
+   tristate '  Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
    tristate '  SysKonnect FDDI PCI support' CONFIG_SKFP
 fi
 
@@ -223,7 +225,7 @@
    dep_tristate '  PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
    dep_tristate '  PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   	dep_tristate '  PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
+      dep_tristate '  PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
    fi
 fi