summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorKevin Lo <kevlo@cvs.openbsd.org>2018-08-03 01:50:16 +0000
committerKevin Lo <kevlo@cvs.openbsd.org>2018-08-03 01:50:16 +0000
commitf7eba6032a0373a25ae53dc4c7e488b5002edb37 (patch)
treeb807a47d1679f6bdbb29620bcbf258aa3569eaeb /sys/arch/amd64
parent8ae7c3fdc5cfd6a41bbef6f30bc08b65b313bdd0 (diff)
Add mue(4), a driver for Microchip LAN75xx/LAN78xx 10/100/1000 USB Ethernet
adapters. "go ahead commit it" deraadt@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ae6b68a73ff..d07eb346fce 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.456 2018/06/30 18:15:12 mlarkin Exp $
+# $OpenBSD: GENERIC,v 1.457 2018/08/03 01:50:14 kevlo Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -280,6 +280,7 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network'
udav* at uhub? # Davicom DM9601 based Ethernet
mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet
+mue* at uhub? # Microchip LAN75xx/LAN78xx Ethernet
url* at uhub? # Realtek RTL8150L based adapters
ure* at uhub? # Realtek RTL8152 based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index e1584ab0e2a..6a50c8dd2d3 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.171 2018/04/26 16:13:13 phessler Exp $
+# $OpenBSD: RAMDISK_CD,v 1.172 2018/08/03 01:50:14 kevlo Exp $
machine amd64
maxusers 4
@@ -111,6 +111,7 @@ smsc* at uhub? # SMSC LAN95xx Ethernet
cdce* at uhub? # CDC Ethernet
udav* at uhub? # Davicom DM9601 based Ethernet
mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet
+mue* at uhub? # Microchip LAN75xx/LAN78xx Ethernet
url* at uhub? # Realtek RTL8150L based adapters
ure* at uhub? # Realtek RTL8152 based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS