From: Ben Gras <ben@minix3.org>
Date: Wed, 2 Dec 2009 15:53:20 +0000 (+0000)
Subject: previous commit premature and not part of FPU changes.
X-Git-Tag: v3.1.6~176
X-Git-Url: http://zhaoyanbai.com/repos/man.named-journalprint.html?a=commitdiff_plain;h=b9825f55e06e73a5530216ca6bba6a1c7d6fc781;p=minix.git

previous commit premature and not part of FPU changes.
---

diff --git a/commands/scripts/netconf.sh b/commands/scripts/netconf.sh
index 351fc1c03..29928c206 100755
--- a/commands/scripts/netconf.sh
+++ b/commands/scripts/netconf.sh
@@ -103,13 +103,10 @@ cards()
            "1186:1340" "11DB:1234" "1259:A117" "1259:A11E" "126C:1211" \
            "13D1:AB06" "1432:9130" "14EA:AB06" "14EA:AB07" "1500:1360" \
            "1743:8139" "4033:1360"
-    card 4 "Realtek 8169 based card"	\
-           "10EC:8129" "10EC:8167" "10EC:8169" "1186:4300" "1259:C107" \
-           "1385:8169" "16EC:0116" "1737:1032"
-    card 5 "Realtek 8029 based card (also emulated by Qemu)" "10EC:8029"
-    card 6 "NE2000, 3com 503 or WD based card (also emulated by Bochs)"
-    card 7 "AMD LANCE (also emulated by VMWare and VirtualBox)" "1022:2000"
-    card 8 "Different Ethernet card (no networking)"
+    card 4 "Realtek 8029 based card (also emulated by Qemu)" "10EC:8029"
+    card 5 "NE2000, 3com 503 or WD based card (also emulated by Bochs)"
+    card 6 "AMD LANCE (also emulated by VMWare and VirtualBox)" "1022:2000"
+    card 7 "Different Ethernet card (no networking)"
 }
 
 warn()
@@ -146,16 +143,15 @@ drv_params()
 	   test "$v" = 1 && echo ""
            test "$v" = 1 && echo "Note: After installing, edit $LOCALRC to the right configuration."
 		;;
-	4) driver=rtl8169;  ;;
 	3) driver=rtl8139;  ;;
-	5) driver=dp8390;   driverargs="dp8390_arg='DPETH0=pci'";	;;
-	6) driver=dp8390;   driverargs="dp8390_arg='DPETH0=240:9'"; 
+	4) driver=dp8390;   driverargs="dp8390_arg='DPETH0=pci'";	;;
+	5) driver=dp8390;   driverargs="dp8390_arg='DPETH0=240:9'"; 
 	   test "$v" = 1 && echo ""
            test "$v" = 1 && echo "Note: After installing, edit $LOCALRC to the right configuration."
            test "$v" = 1 && echo " chose option 4, the defaults for emulation by Bochs have been set."
 		;;
-        7) driver="lance"; ;;    
-        8) driver="psip0"; ;;    
+        6) driver="lance"; ;;    
+        7) driver="psip0"; ;;    
         *) warn "choose a number"
       esac
 }