Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)

1 files changed, 31 insertions, 14 deletions

diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index 81f703e6d..df7d7f60c 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -37,6 +37,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
   fi
   if [ "$CONFIG_ZORRO" = "y" ]; then
     tristate 'Ariadne support' CONFIG_ARIADNE
+    tristate 'Ariadne II support' CONFIG_ARIADNE2
     tristate 'A2065 support' CONFIG_A2065
     tristate 'Hydra support' CONFIG_HYDRA
   fi
@@ -55,6 +56,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
       fi
     fi
     tristate '3c509/3c579 support' CONFIG_EL3
+    tristate '3c515 ISA Fast EtherLink' CONFIG_3C515
     tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX
   fi
   bool 'AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE
@@ -79,11 +81,12 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139
       tristate 'Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN
+      tristate 'Alteon AceNIC & 3Com 3C985 Gigabit support' CONFIG_ACENIC
   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
+      tristate 'AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700
     fi
     tristate 'Cabletron E21xx support' CONFIG_E2100
     tristate 'DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA
@@ -105,6 +108,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
     fi
     bool 'SK_G16 support' CONFIG_SK_G16
   fi
+  if [ "$CONFIG_MCA" = "y" ]; then
+    tristate 'NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
+  fi
   bool 'EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA
   if [ "$CONFIG_NET_EISA" = "y" ]; then
     tristate 'AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
@@ -124,9 +130,11 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
     tristate 'EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
+      tristate 'Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
     fi
     tristate 'PCI NE2000 support' CONFIG_NE2K_PCI
     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
@@ -146,6 +154,17 @@ if [ "$CONFIG_FDDI" = "y" ]; then
   bool 'Digital DEFEA and DEFPA adapter support' CONFIG_DEFXX
 fi
 
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
+  if [ "$CONFIG_HIPPI" = "y" ]; then
+    bool 'CERN HIPPI PCI adapter support' CONFIG_CERN_HIPPI
+    bool 'Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER
+    if [ "$CONFIG_ROADRUNNER" != "n" ]; then
+      bool '  Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
+    fi
+  fi
+fi
+
 tristate 'Frame relay DLCI support' CONFIG_DLCI
 if [ "$CONFIG_DLCI" = "y" -o "$CONFIG_DLCI" = "m" ]; then
   int '  Max open DLCI' CONFIG_DLCI_COUNT 24
@@ -156,19 +175,17 @@ fi
 #
 # AppleTalk
 #
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  if [ "$CONFIG_ATALK" != "n" ]; then
-    tristate 'Apple/Farallon LocalTalk PC support' CONFIG_LTPC
-    tristate 'COPS LocalTalk PC support' CONFIG_COPS
-    if [ "$CONFIG_COPS" != "n" ]; then
-	bool 'Dayna firmware support' CONFIG_COPS_DAYNA
-	bool 'Tangent firmware support' CONFIG_COPS_TANGENT
-    fi
-    tristate 'Appletalk-IP driver support' CONFIG_IPDDP
-    if [ "$CONFIG_IPDDP" != "n" ]; then
-       bool 'IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP
-       bool 'Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP
-    fi
+if [ "$CONFIG_ATALK" != "n" ]; then
+  dep_tristate 'Apple/Farallon LocalTalk PC support' CONFIG_LTPC $CONFIG_ATALK
+  dep_tristate 'COPS LocalTalk PC support' CONFIG_COPS $CONFIG_ATALK
+  if [ "$CONFIG_COPS" != "n" ]; then
+     bool 'Dayna firmware support' CONFIG_COPS_DAYNA
+     bool 'Tangent firmware support' CONFIG_COPS_TANGENT
+  fi
+  dep_tristate 'Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_ATALK
+  if [ "$CONFIG_IPDDP" != "n" ]; then
+     bool 'IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP
+     bool 'Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP
   fi
 fi