summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/NETTAN7
-rw-r--r--sys/arch/i386/conf/PETRA7
-rw-r--r--sys/arch/i386/conf/RAMDISK5
-rw-r--r--sys/arch/i386/conf/RAMDISKB5
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD5
6 files changed, 13 insertions, 19 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index bc791d99c4c..b3329f2e2c9 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.151 2000/01/03 01:22:53 aaron Exp $
+# $OpenBSD: GENERIC,v 1.152 2000/01/06 03:08:28 jason Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -245,7 +245,6 @@ xl* at pci? dev ? function ? # 3c9xx ethernet
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 6faceff1530..ab50be4398e 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-# $OpenBSD: NETTAN,v 1.35 1999/10/03 21:08:15 niklas Exp $
+# $OpenBSD: NETTAN,v 1.36 2000/01/06 03:08:28 jason Exp $
#
# NETTAN -- Applitron Datasystem AB
#
@@ -6,7 +6,7 @@
machine i386 # architecture, used by config; REQUIRED
#include "../../../conf/GENERIC"
-# $OpenBSD: NETTAN,v 1.35 1999/10/03 21:08:15 niklas Exp $
+# $OpenBSD: NETTAN,v 1.36 2000/01/06 03:08:28 jason Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -305,9 +305,8 @@ xl* at pci? dev ? function ? # 3c9xx ethernet
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-pn* at pci? dev ? function ? # Lite-On PNIC ethernet
+dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index 52d1fe34223..a1d4e9c5a05 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-# $OpenBSD: PETRA,v 1.17 1999/11/26 20:24:32 niklas Exp $
+# $OpenBSD: PETRA,v 1.18 2000/01/06 03:08:28 jason Exp $
#
# PETRA -- everything that's currently supported with certain
# changes for Applitron's fileserver petra, a 128 MB
@@ -10,7 +10,7 @@ machine i386 # architecture, used by config; REQUIRED
makeoptions DEBUG="-g" # make a bsd.gdb too
#include "../../../conf/GENERIC"
-# $OpenBSD: PETRA,v 1.17 1999/11/26 20:24:32 niklas Exp $
+# $OpenBSD: PETRA,v 1.18 2000/01/06 03:08:28 jason Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -331,9 +331,8 @@ xl* at pci? dev ? function ? # 3c9xx ethernet
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-pn* at pci? dev ? function ? # Lite-On PNIC ethernet
+dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
ax* at pci? dev ? function ? # ASIX AX88140A ethernet
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index b22353f2519..4d663190ca0 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.74 1999/12/02 18:18:43 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.75 2000/01/06 03:08:28 jason Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -211,10 +211,9 @@ xl* at pci? dev ? function ? # 3C9xx ethernet cards
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet cards
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet cards
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-pn* at pci? dev ? function ? # Lite-On PNIC ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
+dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
# Media Independent Interface (mii) drivers
exphy* at mii? phy ? # 3Com internal PHYs
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 452704a64b0..e98a6028a70 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.10 1999/12/02 18:18:43 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.11 2000/01/06 03:08:28 jason Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -213,9 +213,8 @@ xl* at pci? dev ? function ? # 3C9xx ethernet cards
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet cards
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet cards
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-pn* at pci? dev ? function ? # Lite-On PNIC ethernet
+dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
# Media Independent Interface (mii) drivers
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 62c62af578e..a40e48cb7eb 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.9 1999/12/02 18:18:43 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.10 2000/01/06 03:08:29 jason Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -215,9 +215,8 @@ xl* at pci? dev ? function ? # 3C9xx ethernet cards
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
tx* at pci? dev ? function ? # SMC 83C170 EPIC ethernet cards
tl* at pci? dev ? function ? # Compaq Thunderlan ethernet cards
-mx* at pci? dev ? function ? # Macronix PMAC ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-pn* at pci? dev ? function ? # Lite-On PNIC ethernet
+dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
ax* at pci? dev ? function ? # ASIX AX88140A ethernet