summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/GENERIC3
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 973de570e7c..8c8ca90db81 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.220 2011/03/07 07:05:50 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.221 2011/03/28 15:24:54 claudio Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -299,6 +299,7 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
# sensors
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 82a9570c238..47739ca6a9d 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.81 2010/07/03 03:59:16 krw Exp $
+# $OpenBSD: RAMDISKBIG,v 1.82 2011/03/28 15:24:54 claudio 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.
@@ -248,6 +248,7 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
# ISA/EISA bus support
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 67c2caa6f34..d0a9c56f60b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.709 2011/02/17 20:14:30 miod Exp $
+# $OpenBSD: GENERIC,v 1.710 2011/03/28 15:24:54 claudio Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -704,6 +704,7 @@ jmphy* at mii? # JMicron JMP202/JMP211 PHYs
atphy* at mii? # Attansic F1 PHYs
rdcphy* at mii? # RDC R6040 PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "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 b2e20d6e8e0..dccb068c005 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.183 2011/01/15 04:39:27 kevlo Exp $
+# $OpenBSD: RAMDISK_CD,v 1.184 2011/03/28 15:24:54 claudio Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -436,6 +436,7 @@ jmphy* at mii? # JMicron JMP202/JMP211 PHYs
ipgphy* at mii? # IC Plus IP1000A PHYs
atphy* at mii? # Attansic F1 PHYs
rdcphy* at mii? # RDC R6040 PHY
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
pseudo-device loop 1 # network loopback