Module Name: src
Committed By: jakllsch
Date: Mon Jan 31 16:30:49 UTC 2011
Modified Files:
src/sys/dev/pci: mvsata_pci.c
Log Message:
Make the Adaptec 1420SA entry match the Marvell 88SX6041 entry.
According to
http://lists.freebsd.org/pipermail/freebsd-current/2010-April/016973.html
the Adaptec 1420SA is a 88SX6041 (and the 1430SA is a 88SX7042).
This should fix the problem described in
http://mail-index.netbsd.org/current-users/2010/10/14/msg014526.html
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/mvsata_pci.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/mvsata_pci.c
diff -u src/sys/dev/pci/mvsata_pci.c:1.5 src/sys/dev/pci/mvsata_pci.c:1.6
--- src/sys/dev/pci/mvsata_pci.c:1.5 Sun Aug 1 07:38:17 2010
+++ src/sys/dev/pci/mvsata_pci.c Mon Jan 31 16:30:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata_pci.c,v 1.5 2010/08/01 07:38:17 kiyohara Exp $ */
+/* $NetBSD: mvsata_pci.c,v 1.6 2011/01/31 16:30:48 jakllsch Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.5 2010/08/01 07:38:17 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.6 2011/01/31 16:30:48 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -116,12 +116,12 @@
{ PCI_VP(MARVELL, 88SX5081), 2, 4, gen1, 0 },
{ PCI_VP(MARVELL, 88SX6040), 1, 4, gen2, 0 },
{ PCI_VP(MARVELL, 88SX6041), 1, 4, gen2, 0 },
+ { PCI_VP(ADP2, 1420SA), 1, 4, gen2, 0 }, /* 88SX6041 */
{ PCI_VP(MARVELL, 88SX6042), 1, 4, gen2e, 0 },
{ PCI_VP(MARVELL, 88SX6080), 2, 4, gen2, MVSATA_FLAGS_PCIE },
{ PCI_VP(MARVELL, 88SX6081), 2, 4, gen2, MVSATA_FLAGS_PCIE },
- { PCI_VP(ADP2, 1420SA), 2, 4, gen2, MVSATA_FLAGS_PCIE },
{ PCI_VP(MARVELL, 88SX7042), 1, 4, gen2e, 0 },
- { PCI_VP(ADP2, 1430SA), 1, 4, gen2e, 0 },
+ { PCI_VP(ADP2, 1430SA), 1, 4, gen2e, 0 }, /* 88SX7042 */
{ PCI_VP(TRIONES, ROCKETRAID_2310), 1, 4, gen2e, 0 },
#undef PCI_VP
};
