summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-09-24 19:08:15 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-09-24 19:08:15 +0000
commitd4f7cfae4cbb7041c845f35d443141defcdc9342 (patch)
treeb383d54efc7baa073f6cf6b2be7a46cb74aa3071
parentfd0ce449846fb3976f4822c02a7d7c2f0fa7e377 (diff)
Get rid of gx(4) and use em(4) since it supports more cards and works better
overall.
Diffstat
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/macppc/conf/RAMDISK3
6 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index d33806ca57b..c2183ffb7d6 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.116 2002/09/23 04:37:31 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.117 2002/09/24 19:08:14 nate Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
machine alpha
@@ -167,7 +167,7 @@ bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3)
stge* at pci? dev ? function ? # Sundance TC9021 GigE
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-gx* at pci? dev ? function ? # Intel Pro/1000 ethernet
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
sis* at pci? dev ? function ? # SiS 900/7016 ethernet
#UNTESTED: the following section of drivers is untested on alpha.
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 4eac6b5394c..604c39b0a11 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.34 2002/09/23 04:37:31 deraadt Exp $
+# $OpenBSD: RAMDISKBIG,v 1.35 2002/09/24 19:08:14 nate Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -174,7 +174,7 @@ bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3)
stge* at pci? dev ? function ? # Sundance TC9021 GigE
rl* at pci? dev ? function ? # RealTek 81[23]9 ethernet
vr* at pci? dev ? function ? # VIA Rhine ethernet
-gx* at pci? dev ? function ? # Intel Pro/1000 ethernet
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
sis* at pci? dev ? function ? # SiS 900/7016 ethernet
#UNTESTED: the following section of drivers is untested on alpha.
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7a42eaf88b6..3fcb9befc55 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.318 2002/09/23 04:37:33 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.319 2002/09/24 19:08:14 nate Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -347,7 +347,7 @@ dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
skc* at pci? dev ? function ? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
-gx* at pci? dev ? function ? # Intel Pro/1000 ethernet
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
txp* at pci? dev ? function ? # 3com 3CR990
nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE
bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3)
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 1c734296bab..6638965b102 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.59 2002/09/03 16:43:13 mickey Exp $
+# $OpenBSD: RAMDISK_CD,v 1.60 2002/09/24 19:08:14 nate Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -291,7 +291,7 @@ wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
skc* at pci? dev ? function ? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
-gx* at pci? dev ? function ? # Intel Pro/1000 ethernet
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
txp* at pci? dev ? function ? # 3com 3CR990
nge* at pci? dev ? function ? # NS DP83820/DP83821 GigE
bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3)
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index caff5e35d1d..0d92da4d9eb 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.31 2002/09/06 19:30:12 drahn Exp $g
+# $OpenBSD: GENERIC,v 1.32 2002/09/24 19:08:14 nate Exp $g
#
# PPC GENERIC config file
#
@@ -58,6 +58,7 @@ macobio0 at pci? dev ? function ?
gem* at pci? dev ? function ? # GMAC ethernet
hme* at pci? dev ? function ? # HME ethernet
dc* at pci? dev ? function ? # DEC Tulip 21143 clones
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
an* at pci? dev ? function ? # Cisco/Aironet
wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS
iop* at pci? dev ? function ? # I2O processor
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 4eb9051cbe7..5c650766ca5 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.17 2002/09/13 22:01:04 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.18 2002/09/24 19:08:14 nate Exp $
#
# PPC GENERIC config file
#
@@ -59,6 +59,7 @@ macobio0 at pci? dev ? function ?
gem* at pci? dev ? function ? # GMAC ethernet
hme* at pci? dev ? function ? # HME ethernet
dc* at pci? dev ? function ? # DEC Tulip 21143 clones
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
an* at pci? dev ? function ? # Cisco/Aironet 802.11DS
wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:19:20 +0000