summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
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 /sys/arch/i386/conf
parentfd0ce449846fb3976f4822c02a7d7c2f0fa7e377 (diff)
Get rid of gx(4) and use em(4) since it supports more cards and works better
overall.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
2 files changed, 4 insertions, 4 deletions
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)