[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/af34c0f6d5e7
branches:  netbsd-8
changeset: 434721:af34c0f6d5e7
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 08 14:31:18 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #616):
        sys/dev/pci/if_msk.c: revision 1.55
        sys/dev/pci/pcidevs: revision 1.1299
update entry for Marvel Yukon 8058, and fix URL for pci ids (Rocky Hotas)

diffstat:

 sys/dev/pci/if_msk.c |  6 +++---
 sys/dev/pci/pcidevs  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r c51cd25b0fb0 -r af34c0f6d5e7 sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Thu Mar 08 14:29:12 2018 +0000
+++ b/sys/dev/pci/if_msk.c      Thu Mar 08 14:31:18 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.54 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $ */
 /*     $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -160,7 +160,6 @@
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_C034 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_C036 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_C042 },
-       { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_C055 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8035 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8036 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8038 },
@@ -171,6 +170,7 @@
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8053 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8055 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8056 },
+       { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8058 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKONII_8021CU },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKONII_8021X },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKONII_8022CU },
diff -r c51cd25b0fb0 -r af34c0f6d5e7 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Thu Mar 08 14:29:12 2018 +0000
+++ b/sys/dev/pci/pcidevs       Thu Mar 08 14:31:18 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.2 2017/11/21 14:48:23 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.3 2018/03/08 14:31:18 martin Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -34,7 +34,7 @@
 /*
  * NOTE: a fairly complete list of PCI codes can be found at:
  *
- *     http://www.pcidatabase.com/
+ *     https://pci-ids.ucw.cz/
  *
  * (but it doesn't always seem to match vendor documentation)
  *
@@ -2450,7 +2450,7 @@
 product MARVELL YUKON_C032     0x4367  Yukon 88EC032
 product MARVELL YUKON_C034     0x4368  Yukon 88EC034
 product MARVELL YUKON_C042     0x4369  Yukon 88EC042
-product MARVELL YUKON_C055     0x436a  Yukon 88EC055
+product MARVELL YUKON_8058     0x436a  Yukon 88E8058
 product MARVELL GT64120                0x4620  GT-64120 System Controller
 product MARVELL BELKIN         0x5005  Belkin Gigabit Ethernet
 product MARVELL 88SX5040       0x5040  88SX5040 SATA