Module Name: src
Committed By: snj
Date: Thu Dec 8 07:52:51 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: satalink.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/pci/satalink.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/satalink.c
diff -u src/sys/dev/pci/satalink.c:1.52 src/sys/dev/pci/satalink.c:1.52.4.1
--- src/sys/dev/pci/satalink.c:1.52 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/satalink.c Thu Dec 8 07:52:51 2016
@@ -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 @@ static const struct pciide_product_desc
"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",
