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

• Lines: 44
• Date: Mon Oct 30 14:34:12 2000
• Orig file: v2.4.0-test9/linux/drivers/net/Config.in
• Orig date: Sun Oct 8 10:50:18 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -52,6 +52,9 @@
    if [ "$CONFIG_SGI_IP27" = "y" ]; then
       bool '  SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
    fi
+   if [ "CONFIG_IA64_SGI_SN1" = "y" ]; then
+      bool '  SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
+   fi
    if [ "$CONFIG_SUPERH" = "y" ]; then
       tristate '  National DP83902AV  support' CONFIG_STNIC
    fi
@@ -96,6 +99,7 @@
       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_NET_ISA" = "y" ]; then
       tristate '    Cabletron E21xx support' CONFIG_E2100
@@ -109,7 +113,6 @@
       fi
       tristate '    HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS
       tristate '    HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN
-      tristate '    HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100
       tristate '    ICL EtherTeam 16i/32 support' CONFIG_ETH16I
       tristate '    NE2000/NE1000 support' CONFIG_NE2000
       if [ "$CONFIG_OBSOLETE" = "y" ]; then
@@ -146,7 +149,7 @@
 	 tristate '    Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
       fi
       dep_tristate '    National Semiconductor DP83810 series PCI Ethernet support' CONFIG_NATSEMI $CONFIG_PCI
-      dep_tristate '    PCI NE2000 support' CONFIG_NE2K_PCI $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
@@ -192,7 +195,7 @@
 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
+dep_tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN $CONFIG_PCI
 
 endmenu