patch-2.3.99-pre3 linux/drivers/net/Config.in

• Lines: 46
• Date: Tue Mar 21 14:43:39 2000
• Orig file: v2.3.99-pre2/linux/drivers/net/Config.in
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/net/Config.in linux/drivers/net/Config.in
@@ -124,9 +124,7 @@
    bool '  EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
    if [ "$CONFIG_NET_PCI" = "y" ]; then
       tristate '    AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
-      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-	 tristate '    Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE
-      fi
+      dep_tristate '    Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE $CONFIG_PCI $CONFIG_EXPERIMENTAL
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
 	 tristate '    Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
       fi
@@ -134,12 +132,12 @@
       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_TULIP
+      dep_tristate '    DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP $CONFIG_PCI
       tristate '    Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          tristate '    DM9102 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_DM9102
       fi
-      tristate '    EtherExpressPro/100 support' CONFIG_EEPRO100
+      dep_tristate '    EtherExpressPro/100 support' CONFIG_EEPRO100 $CONFIG_PCI
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          if [ "$CONFIG_EEPRO100" = "y" -o "$CONFIG_EEPRO100" = "m" ]; then
 	    bool '      Enable Power Management (EXPERIMENTAL)' CONFIG_EEPRO100_PM
@@ -147,7 +145,7 @@
 	 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
+      dep_tristate '    PCI NE2000 support' CONFIG_NE2K_PCI $CONFIG_PCI
       # tristate '    Sundance Alta support' CONFIG_ALTA
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          tristate '    RealTek 8129 (not 8019/8029!) support (EXPERIMENTAL)' CONFIG_RTL8129
@@ -166,7 +164,9 @@
    fi
    bool '  Pocket and portable adapters' CONFIG_NET_POCKET
    if [ "$CONFIG_NET_POCKET" = "y" ]; then
-      tristate '    AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
+      if [ "$CONFIG_X86" = "y" ]; then
+         tristate '    AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
+      fi
       tristate '    D-Link DE600 pocket adapter support' CONFIG_DE600
       tristate '    D-Link DE620 pocket adapter support' CONFIG_DE620
    fi