o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 32 insertions, 6 deletions

diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index dfe3ed200..b50c8d638 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -24,18 +24,31 @@ fi
 #
 bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
 if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
-  if [ "$CONFIG_PMAC" = "y" ]; then
+  if [ "$CONFIG_ARM" = "y" ]; then
+    if [ "$CONFIG_ARCH_ACORN" != "y" ]; then
+      tristate 'AM79C961A support' CONFIG_ARM_AM79C961A
+    else
+      source drivers/acorn/net/Config.in
+    fi
+  fi
+  if [ "$CONFIG_PPC" = "y" ]; then
     bool 'MACE (Power Mac ethernet) support' CONFIG_MACE
+    bool 'BMAC (G3 ethernet) support' CONFIG_BMAC
+  fi
+  if [ "$CONFIG_ZORRO" = "y" ]; then
+    tristate 'Ariadne support' CONFIG_ARIADNE
+    tristate 'A2065 support' CONFIG_A2065
+    tristate 'Hydra support' CONFIG_HYDRA
   fi
   if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then
-    tristate 'MIPS JAZZ onboard SONIC ethernet support' CONFIG_MIPS_JAZZ_SONIC
+    tristate 'MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC
   fi
   bool '3COM cards' CONFIG_NET_VENDOR_3COM
   if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
     tristate '3c501 support' CONFIG_EL1
     tristate '3c503 support' CONFIG_EL2
+    tristate '3c505 support' CONFIG_ELPLUS
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-      tristate '3c505 support' CONFIG_ELPLUS
       tristate '3c507 support' CONFIG_EL16
       if [ "$CONFIG_MCA" = "y" ]; then
         tristate '3c523 support' CONFIG_ELMC
@@ -63,6 +76,10 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
     tristate 'NI5210 support' CONFIG_NI52
     tristate 'NI6510 support' CONFIG_NI65
   fi
+  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      tristate 'RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139
+      tristate 'Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN
+  fi
   bool 'Other ISA cards' CONFIG_NET_ISA
   if [ "$CONFIG_NET_ISA" = "y" ]; then
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -90,22 +107,29 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
   fi
   bool 'EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA
   if [ "$CONFIG_NET_EISA" = "y" ]; then
-    bool 'AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
+    tristate 'AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
     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 'Apricot Xen-II on board Ethernet' CONFIG_APRICOT
     tristate 'CS89x0 support' CONFIG_CS89x0
     tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
     tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
+    if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
+      tristate 'Cobalt DECchip Tulip (dc21x4x) onboard support' CONFIG_COBALT_TULIP
+    fi
     tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP
     tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
     tristate 'EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+      tristate 'Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
+    fi
+    tristate 'PCI NE2000 support' CONFIG_NE2K_PCI
+    tristate 'TI ThunderLAN support' CONFIG_TLAN
+    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate 'Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
       tristate 'SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100
-      tristate 'TI ThunderLAN support (EXPERIMENTAL)' CONFIG_TLAN
       bool 'Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
     fi
   fi
@@ -173,6 +197,8 @@ fi
 bool 'Token Ring driver support' CONFIG_TR
 if [ "$CONFIG_TR" = "y" ]; then
   tristate 'IBM Tropic chipset based adaptor support' CONFIG_IBMTR
+#  tristate 'IBM Lanstreamer PCI adaptor support' CONFIG_IBMLS
+  tristate 'SysKonnect adapter support' CONFIG_SKTR
 fi
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then