summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2006-11-06 03:34:59 +0000
committerderaadt <deraadt@openbsd.org>2006-11-06 03:34:59 +0000
commit8d976745792ffecafd46342875499f1895a8c78f (patch)
tree626755b39fb4ca174d06c96651139b45b81a9030
parentfix proxying on big-endian 64-bit machines, u_long is not the size of (diff)
downloadwireguard-openbsd-8d976745792ffecafd46342875499f1895a8c78f.tar.xz
wireguard-openbsd-8d976745792ffecafd46342875499f1895a8c78f.zip
add gem and gentbi; why not
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index a0fc1fcd447..e8ce25f8dd4 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.163 2006/10/26 04:14:09 jsg Exp $
+# $OpenBSD: GENERIC,v 1.164 2006/11/06 03:34:59 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -367,6 +367,7 @@ nfe* at pci? # NVIDIA nForce Ethernet
musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
+gem* at pci? # Sun 'gem' ethernet
bce* at pci? # Broadcom BCM4401
# Wireless network cards
@@ -416,6 +417,7 @@ nsgphy* at mii? # NS gigabit PHYs
rgephy* at mii? # Realtek 8169S/8110S PHY
urlphy* at mii? # Realtek RTL8150L internal PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
+gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # "unknown" PHYs
eap* at pci? # Ensoniq AudioPCI S5016
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index fcea8af80a8..02796f6a9b3 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.531 2006/11/02 20:45:17 dlg Exp $
+# $OpenBSD: GENERIC,v 1.532 2006/11/06 03:34:59 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -508,6 +508,7 @@ nfe* at pci? # NVIDIA nForce Ethernet
musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
+gem* at pci? # Sun 'gem' ethernet
vic* at pci? # VMware VMXnet virtual interface
# Wireless network cards
@@ -560,6 +561,7 @@ nsgphy* at mii? # NS gigabit PHYs
urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
+gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # "unknown" PHYs
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System