diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-02-23 15:21:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-02-23 15:21:35 +0000 |
| commit | 001fa46b78e20fb1b3264f616045c609b705af1c (patch) | |
| tree | 6b075a90a691966aec1f95936cafc9aa16d2bed6 | |
| parent | d7828af3a1531f63df1cb451ee02cc14cad84ba6 (diff) | |
Match on the SAS1078DE which appears to be used in at least the
ServeRAID-MR10is.
While here remove duplicate entries for SAS1078/PERC6 which
are the same id, both with a SYMBIOS (LSI) vendor id and
same product id (0x0060).
ok marco@ dlg@ deraadt@
| -rw-r--r-- | sys/dev/pci/mfi_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index 931e4df424a..f45005afd63 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.20 2009/02/10 23:21:44 marco Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.21 2009/02/23 15:21:34 jsg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -90,10 +90,10 @@ struct mfi_pci_device { MFI_IOP_XSCALE, NULL }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1078, MFI_IOP_PPC, mfi_1078_subtypes }, + { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS1078DE, + MFI_IOP_PPC, mfi_1078_subtypes }, { PCI_VENDOR_DELL, PCI_PRODUCT_DELL_PERC5, MFI_IOP_XSCALE, mfi_perc5_subtypes }, - { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_DELL_PERC6, - MFI_IOP_PPC, mfi_1078_subtypes }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_1, MFI_IOP_GEN2, mfi_gen2_subtypes }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2108_2, diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 56fbec4bcc4..144f3c72257 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1456 2009/02/15 01:42:34 jsg Exp $ +$OpenBSD: pcidevs,v 1.1457 2009/02/23 15:21:33 jsg Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1774,7 +1774,6 @@ product DELL PERC_3DI_3_SUB 0x0106 PERC 3/Di product DELL PERC_3DI_3_SUB2 0x011b PERC 3/Di product DELL PERC_3DI_3_SUB3 0x0121 PERC 3/Di product DELL PERC5 0x0015 PERC 5 -product DELL PERC6 0x0060 PERC 6 /* Delta Electronics products */ product DELTA RHINEII 0x1320 RhineII @@ -3450,6 +3449,7 @@ product SYMBIOS SAS1064A 0x005c SAS1064A product SYMBIOS SAS1066 0x005e SAS1066 product SYMBIOS SAS1078 0x0060 SAS1078 product SYMBIOS SAS1078_PCIE 0x0062 SAS1078 +product SYMBIOS SAS1078DE 0x007c SAS1078DE product SYMBIOS 875J 0x008f 53c875J product SYMBIOS MEGARAID_320 0x0407 MegaRAID 320 product SYMBIOS MEGARAID_3202E 0x0408 MegaRAID 320-2E |