Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci revert unintended changes
details: https://anonhg.NetBSD.org/src/rev/70e4331fef0a
branches: trunk
changeset: 325861:70e4331fef0a
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 09 22:37:18 2014 +0000
description:
revert unintended changes
diffstat:
sys/dev/pci/ahcisata_pci.c | 6 +++---
sys/dev/pci/pcidevs | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diffs (44 lines):
diff -r d8a77dfd3284 -r 70e4331fef0a sys/dev/pci/ahcisata_pci.c
--- a/sys/dev/pci/ahcisata_pci.c Thu Jan 09 21:14:53 2014 +0000
+++ b/sys/dev/pci/ahcisata_pci.c Thu Jan 09 22:37:18 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -167,7 +167,7 @@
AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145,
AHCI_QUIRK_BADPMP },
- { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE912X,
+ { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE9128,
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
diff -r d8a77dfd3284 -r 70e4331fef0a sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs Thu Jan 09 21:14:53 2014 +0000
+++ b/sys/dev/pci/pcidevs Thu Jan 09 22:37:18 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1178 2014/01/09 17:28:05 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1179 2014/01/09 22:37:18 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2340,6 +2340,7 @@
product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller
product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller
product MARVELL2 88SE9172 0x9172 88SE9172 SATA
+product MARVELL2 88SE9128 0x91a3 88SE9128 SATA
product MARVELL2 88SE9182 0x9182 88SE9182 SATA
product MARVELL2 88SE9183 0x9183 88SE9183 SATA
product MARVELL2 88SE9215 0x9215 88SE9215 SATA
Home |
Main Index |
Thread Index |
Old Index