summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2011-10-10 12:34:23 +0000
committerjsg <jsg@openbsd.org>2011-10-10 12:34:23 +0000
commit2630d31f1d2ca96baca5dbddd25de043eaa38449 (patch)
tree13cfdc0457e41281cb7b9619dec9ec947e99eb6d
parentallow for this to timeout rather than hanging forever. (diff)
downloadwireguard-openbsd-2630d31f1d2ca96baca5dbddd25de043eaa38449.tar.xz
wireguard-openbsd-2630d31f1d2ca96baca5dbddd25de043eaa38449.zip
add tlphy everywhere tl is enabled
pointed out by Loganaden Velvindron/brad
-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 35ae331f9b6..d9bc9e0fb70 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.225 2011/09/04 20:10:18 miod Exp $
+# $OpenBSD: GENERIC,v 1.226 2011/10/10 12:34:23 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -271,6 +271,7 @@ nsphyter* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY
sqphy* at mii? # Seeq 8x220 PHYs
+tlphy* at mii? # ThunderLAN PHYs
rlphy* at mii? # RealTek 8139 internal PHYs
mtdphy* at mii? # Myson MTD972 PHYs
dcphy* at mii? # Digital Clone PHYs
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index d26bfe1b5ac..478df57c829 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.84 2011/06/29 20:52:08 matthew Exp $
+# $OpenBSD: RAMDISKBIG,v 1.85 2011/10/10 12:34:23 jsg 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.
@@ -222,6 +222,7 @@ nsphyter* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY
sqphy* at mii? # Seeq 8x220 PHYs
+tlphy* at mii? # ThunderLAN PHYs
rlphy* at mii? # RealTek 8139 internal PHYs
mtdphy* at mii? # Myson MTD972 PHYs
dcphy* at mii? # Digital Clone PHYs
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index bce118a87fe..581188d6c5a 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.728 2011/09/20 20:25:45 matthieu Exp $
+# $OpenBSD: GENERIC,v 1.729 2011/10/10 12:34:23 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -629,6 +629,7 @@ nsphyter* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY
sqphy* at mii? # Seeq 8x220 PHYs
+tlphy* at mii? # ThunderLAN PHYs
rlphy* at mii? # RealTek 8139 internal PHYs
mtdphy* at mii? # Myson MTD972 PHYs
dcphy* at mii? # Digital Clone PHYs
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index c63a2e718ac..b4680259d44 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.191 2011/10/06 20:49:28 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.192 2011/10/10 12:34:23 jsg Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -381,6 +381,7 @@ nsphyter* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY
sqphy* at mii? # Seeq 8x220 PHYs
+tlphy* at mii? # ThunderLAN PHYs
rlphy* at mii? # RealTek 8139 internal PHYs
mtdphy* at mii? # Myson MTD972 PHYs
dcphy* at mii? # Digital Clone PHYs