summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2011-03-28 15:24:55 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2011-03-28 15:24:55 +0000
commitcb03bbfe46cc37e0d96cd266d1f83e034647644d (patch)
tree64199b51c018125d03c2d37f57d12deb529c4aa2 /sys/arch/i386
parent91dd6cc2712b94be06fc77499bdd4b6fcfc17885 (diff)
Include mlphy(4) to the kernels that include tl(4).
OK sthen@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
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