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

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

details:   https://anonhg.NetBSD.org/src/rev/4800131a1074
branches:  netbsd-7
changeset: 800029:4800131a1074
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 08 07:52:51 2016 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1290):
        sys/dev/pci/satalink.c: revision 1.53
Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA has
the same ID.

diffstat:

 sys/dev/pci/satalink.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r f2098afa0d82 -r 4800131a1074 sys/dev/pci/satalink.c
--- a/sys/dev/pci/satalink.c    Thu Dec 08 07:50:15 2016 +0000
+++ b/sys/dev/pci/satalink.c    Thu Dec 08 07:52:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $   */
+/*     $NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $    */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.52.4.1 2016/12/08 07:52:51 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,11 +275,6 @@
          "Silicon Image SATALink 3112",
          sii3112_chip_map,
        },
-       { PCI_PRODUCT_CMDTECH_240,
-         0,
-         "Silicon Image SATALink Sil240",
-         sii3112_chip_map,
-       },
        { PCI_PRODUCT_CMDTECH_3512,
          0,
          "Silicon Image SATALink 3512",