patch-2.0.34 linux/drivers/net/Config.in

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

diff -u --recursive --new-file v2.0.33/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -41,7 +41,7 @@
 #
 bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
 if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
-  bool '3COM cards' CONFIG_NET_VENDOR_3COM
+  bool '3COM ISA, EISA and PCI cards' CONFIG_NET_VENDOR_3COM
   if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
     tristate '3c501 support' CONFIG_EL1
     tristate '3c503 support' CONFIG_EL2
@@ -50,24 +50,35 @@
       tristate '3c507 support' CONFIG_EL16
     fi
     tristate '3c509/3c579 support' CONFIG_EL3
+    tristate '3c515 ISA Fast EtherLink' CONFIG_3C515
     tristate '3c590/3c900 series (592/595/597/900/905) "Vortex/Boomerang" support' CONFIG_VORTEX
   fi
-  bool 'AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
-  if [ "$CONFIG_LANCE" = "y" ]; then
-    bool 'AMD PCInet32 (VLB and PCI) support' CONFIG_LANCE32
-  fi  
-  bool 'Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC
+  bool 'Western Digital/SMC ISA and EISA cards' CONFIG_NET_VENDOR_SMC
   if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then
     tristate 'WD80*3 support' CONFIG_WD80x3
     tristate 'SMC Ultra support' CONFIG_ULTRA
     tristate 'SMC Ultra32 support' CONFIG_ULTRA32
     tristate 'SMC 9194 support' CONFIG_SMC9194
   fi
+  bool 'PCI Ethernet adapters' CONFIG_NET_PCI
+  if [ "$CONFIG_NET_PCI" = "y" ]; then
+    tristate 'AMD PCI PCnet32 (PCI bus NE2100 cards) support' CONFIG_PCNET32
+    tristate 'Intel EtherExpressPro PCI 10+/100B/100+ support' CONFIG_EEXPRESS_PRO100B
+    tristate 'DE425, DE434, DE435, DE450, DE500 support' CONFIG_DE4X5
+    tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
+    tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
+    tristate 'PCI NE2000 support' CONFIG_NE2K_PCI
+    tristate 'Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN
+    tristate 'RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139
+    tristate 'SMC EPIC/100 (EtherPower II) support' CONFIG_EPIC
+    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      tristate 'TI ThunderLAN support (EXPERIMENTAL)' CONFIG_TLAN
+   fi
+  fi
   bool 'Other ISA cards' CONFIG_NET_ISA
   if [ "$CONFIG_NET_ISA" = "y" ]; then
-    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-      tristate 'AT1700 support (EXPERIMENTAL)' CONFIG_AT1700
-    fi
+    tristate 'AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
+    tristate 'AT1700 (Fujitsu 86965) support' CONFIG_AT1700
     tristate 'Cabletron E21xx support' CONFIG_E2100
     tristate 'DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
     tristate 'EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
@@ -82,7 +93,7 @@
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'ICL EtherTeam 16i/32 support' CONFIG_ETH16I
     fi
-    tristate 'NE2000/NE1000 support' CONFIG_NE2000
+    tristate 'NE2000/NE1000 ISA support' CONFIG_NE2000
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'NI5210 support' CONFIG_NI52
       tristate 'NI6510 support' CONFIG_NI65
@@ -92,23 +103,19 @@
     fi
     bool 'SK_G16 support' CONFIG_SK_G16
   fi
-  bool 'EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA
+  bool 'EISA, VLB and other board controllers' CONFIG_NET_EISA
   if [ "$CONFIG_NET_EISA" = "y" ]; then
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
     fi
     tristate 'Apricot Xen-II on board ethernet' CONFIG_APRICOT
-    tristate 'Intel EtherExpress/Pro 100B support' CONFIG_EEXPRESS_PRO100B
-    tristate 'DE425, DE434, DE435, DE450, DE500 support' CONFIG_DE4X5
-    tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
-    tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       bool 'Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
     fi
   fi
   bool 'Pocket and portable adaptors' CONFIG_NET_POCKET
   if [ "$CONFIG_NET_POCKET" = "y" ]; then
-    bool 'AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP
+    tristate 'AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP
     tristate 'D-Link DE600 pocket adaptor support' CONFIG_DE600
     tristate 'D-Link DE620 pocket adaptor support' CONFIG_DE620
   fi

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov