summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2017-03-08 11:47:07 +0000
committerpatrick <patrick@openbsd.org>2017-03-08 11:47:07 +0000
commitdc5bb4f6fb93ab4123df8fcff1d770d9f0be1188 (patch)
tree3c326da6f2237ace3adcaf8af652dd51c2a65304
parentEnable eephy(4). (diff)
downloadwireguard-openbsd-dc5bb4f6fb93ab4123df8fcff1d770d9f0be1188.tar.xz
wireguard-openbsd-dc5bb4f6fb93ab4123df8fcff1d770d9f0be1188.zip
Enable msk(4).
-rw-r--r--sys/arch/arm64/conf/GENERIC4
-rw-r--r--sys/arch/arm64/conf/RAMDISK4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 859202c5e81..97c4c825ff3 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.20 2017/03/08 11:45:23 patrick Exp $
+# $OpenBSD: GENERIC,v 1.21 2017/03/08 11:47:07 patrick Exp $
#
# GENERIC machine description file
#
@@ -92,6 +92,8 @@ pci* at ppb?
# PCI Ethernet
em* at pci? # Intel Pro/1000 Ethernet
ix* at pci? # Intel 82598EB 10Gb Ethernet
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
re* at pci? # Realtek 8169/8169S/8110S
# PCI SCSI
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index fa0684e71d1..58f6bcd8be2 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.17 2017/03/08 11:45:23 patrick Exp $
+# $OpenBSD: RAMDISK,v 1.18 2017/03/08 11:47:07 patrick Exp $
#
# GENERIC machine description file
#
@@ -99,6 +99,8 @@ pci* at ppb?
# PCI Ethernet
em* at pci? # Intel Pro/1000 Ethernet
ix* at pci? # Intel 82598EB 10Gb Ethernet
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
re* at pci? # Realtek 8169/8169S/8110S
# PCI SCSI