summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-03-31 18:33:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-03-31 18:33:27 +0000
commit21334bb92d416d7e0e88c464a313c25630ba6b67 (patch)
treedc934ef1d93f69576aab406bad998c2d7305398c /sys/arch/i386/conf
parent6f71f9f228bb70fd9e068d1e7f7a1c439ab52a69 (diff)
nsphy/ukphy fit
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/RAMDISK6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f5bba379d32..35444bf47b6 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.106 1999/03/11 22:00:17 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.107 1999/03/31 18:33:26 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -203,12 +203,12 @@ wb* at pci? dev ? function ? # Winbond W89C840F ethernet
inphy* at mii? phy ? # Intel 82555 PHYs
#icsphy* at mii? phy ? # ICS 1890 PHYs
#lxtphy* at mii? phy ? # Level1 LXT970 PHYs
-#nsphy* at mii? phy ? # NS and compatible PHYs
+nsphy* at mii? phy ? # NS and compatible PHYs
#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs
#sqphy* at mii? phy ? # Seeq 8x220 PHYs
rlphy* at mii? phy ? # RealTek 8139 internal PHYs
#mtdphy* at mii? phy ? # Myson MTD972 PHYs
-#ukphy* at mii? phy ? # "unknown" PHYs
+ukphy* at mii? phy ? # "unknown" PHYs
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 202c7789832..6db418f4553 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.62 1999/03/11 22:00:18 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.63 1999/03/31 18:33:26 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -205,12 +205,12 @@ wb* at pci? dev ? function ? # Winbond W89C840F ethernet
inphy* at mii? phy ? # Intel 82555 PHYs
#icsphy* at mii? phy ? # ICS 1890 PHYs
#lxtphy* at mii? phy ? # Level1 LXT970 PHYs
-#nsphy* at mii? phy ? # NS and compatible PHYs
+nsphy* at mii? phy ? # NS and compatible PHYs
#qsphy* at mii? phy ? # Quality Semi QS6612 PHYs
#sqphy* at mii? phy ? # Seeq 8x220 PHYs
rlphy* at mii? phy ? # RealTek 8139 internal PHYs
#mtdphy* at mii? phy ? # Myson MTD972 PHYs
-#ukphy* at mii? phy ? # "unknown" PHYs
+ukphy* at mii? phy ? # "unknown" PHYs
pseudo-device loop 1 # network loopback
#pseudo-device sl 1 # CSLIP