summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-06-05 22:29:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-06-05 22:29:20 +0000
commit28a7980b174a37336f7bd40746bc0226ef7fada3 (patch)
treebe111b4d295a9b392b8fc02eeb00f9f40b9f8d27
parentb8d1ebca8afd97b62e45dfaae7fdc9271ae8f35e (diff)
re(4) on these media.. for now
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD5
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d3ae3db56c5..5ca7b4a067e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.368 2004/06/05 15:06:22 grange Exp $
+# $OpenBSD: GENERIC,v 1.369 2004/06/05 22:29:19 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -407,6 +407,7 @@ 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)
+re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
stge* at pci? dev ? function ? # Sundance TC9021 GigE
#lge* at pci? dev ? function ? # Level1 LXT1001 GigE
hme* at pci? dev ? function ? # Sun Happy Meal
@@ -444,6 +445,7 @@ eephy* at mii? phy ? # Marvell 88E1000 series PHY
xmphy* at mii? phy ? # XaQti XMAC-II PHYs
nsgphy* at mii? phy ? # NS gigabit PHYs
urlphy* at mii? phy ? # Realtek RTL8150L internal PHY
+rgephy* at mii? phy ? # Realtek 8169S/8110S PHY
ukphy* at mii? phy ? # "unknown" PHYs
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 9f2213ba41e..f54ce9d2ff6 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.73 2004/06/03 18:22:21 grange Exp $
+# $OpenBSD: RAMDISK_CD,v 1.74 2004/06/05 22:29:19 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -308,6 +308,8 @@ sk* at skc? # each port of above
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
+re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
+stge* at pci? dev ? function ? # Sundance TC9021 GigE
bge* at pci? dev ? function ? # Broadcom BCM570x (aka Tigon3)
#lge* at pci? dev ? function ? # Level1 LXT1001 GigE
mtd* at pci? dev ? function ? # Myson MTD803
@@ -341,6 +343,7 @@ brgphy* at mii? phy ? # Broadcom Gigabit PHYs
eephy* at mii? phy ? # Marvell 88E1000 series PHY
xmphy* at mii? phy ? # XaQti XMAC-II PHYs
bmtphy* at mii? phy ? # Broadcom 10/100 PHYs
+rgephy* at mii? phy ? # Realtek 8169S/8110S PHY
ukphy* at mii? phy ? # "unknown" PHYs
pseudo-device loop 1 # network loopback