[src/netbsd-9]: src/sys/arch/amd64/conf Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39aa22d9597d
branches:  netbsd-9
changeset: 963103:39aa22d9597d
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 15 18:10:09 2019 +0000

description:
Pull up following revision(s) (requested by tnn in ticket #306):

        sys/arch/amd64/conf/GENERIC: revision 1.536

add mcx(4) to GENERIC

Tested on dual-port ConnectX-4 with 25 Gbit/s AOC

diffstat:

 sys/arch/amd64/conf/GENERIC |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 6619b13bc2d4 -r 39aa22d9597d sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Oct 15 18:08:31 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Oct 15 18:10:09 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.2 2019/08/09 16:06:39 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.3 2019/10/15 18:10:09 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.531.2.2 $"
+#ident         "GENERIC-$Revision: 1.531.2.3 $"
 
 maxusers       64              # estimated number of users
 
@@ -792,6 +792,7 @@
 le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lii*   at pci? dev ? function ?        # Atheros L2 Fast-Ethernet
 malo*  at pci? dev ? function ?        # Marvell Libertas Wireless
+mcx*   at pci? dev ? function ?        # Mellanox 5th generation Ethernet
 mskc*  at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
 msk*   at mskc?                        # Marvell Yukon 2 Gigabit Ethernet
 mtd*   at pci? dev ? function ?        # Myson MTD803 3-in-1 Ethernet