summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-02-13 19:56:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-02-13 19:56:48 +0000
commitfb6c2af538b6129dced9f960da2c260bbe6379b5 (patch)
treeb49e47e3096698dacd4e36c4cc2597001b7c967f
parent1df6279ddc24bed97ee07e8df7a9e433b87926a0 (diff)
sync
-rw-r--r--sys/dev/pci/pcidevs.h9
-rw-r--r--sys/dev/pci/pcidevs_data.h16
2 files changed, 20 insertions, 5 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 5c13c0410ea..561a96d032d 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: pcidevs,v 1.1454 2009/02/07 02:05:16 jsg Exp
+ * OpenBSD: pcidevs,v 1.1455 2009/02/13 19:56:41 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -361,6 +361,7 @@
#define PCI_PRODUCT_O2MICRO_OZ7120 0x7120 /* OZ711MP1 SDHC */
#define PCI_PRODUCT_O2MICRO_OZ7130 0x7130 /* OZ711MP1 XDHC */
#define PCI_PRODUCT_O2MICRO_OZ7134 0x7134 /* OZ711MP1 CardBus */
+#define PCI_PRODUCT_O2MICRO_OZ7135 0x7135 /* OZ711EZ1 CardBus */
#define PCI_PRODUCT_O2MICRO_OZ7223 0x7223 /* OZ711E0 CardBus */
/* 3Com Products */
@@ -729,7 +730,8 @@
#define PCI_PRODUCT_AMD_RS780_PCIE_3 0x9604 /* RS780 PCIE */
#define PCI_PRODUCT_AMD_RS780_PCIE_4 0x9605 /* RS780 PCIE */
#define PCI_PRODUCT_AMD_RS780_PCIE_5 0x9606 /* RS780 PCIE */
-#define PCI_PRODUCT_AMD_RS780_PCIE_6 0x9609 /* RS780 PCIE */
+#define PCI_PRODUCT_AMD_RS780_PCIE_6 0x9607 /* RS780 PCIE */
+#define PCI_PRODUCT_AMD_RS780_PCIE_7 0x9609 /* RS780 PCIE */
/* AMI */
#define PCI_PRODUCT_AMI_MEGARAID 0x1960 /* MegaRAID */
@@ -1296,7 +1298,8 @@
#define PCI_PRODUCT_ATI_RS780_PCIE_1 0x9602 /* RS780 PCIE */
#define PCI_PRODUCT_ATI_RS780_PCIE_2 0x9609 /* RS780 PCIE */
#define PCI_PRODUCT_ATI_RS780_HDA 0x960f /* RS780 HD Audio */
-#define PCI_PRODUCT_ATI_RADEON_HD3200 0x9610 /* Radeon HD 3200 */
+#define PCI_PRODUCT_ATI_RADEON_HD3200_1 0x9610 /* Radeon HD 3200 */
+#define PCI_PRODUCT_ATI_RADEON_HD3200_2 0x9612 /* Radeon HD 3200 */
#define PCI_PRODUCT_ATI_RADEON_HD2600_HDA 0xaa08 /* Radeon HD 2600 HD Audio */
#define PCI_PRODUCT_ATI_RS690M_HDA 0xaa10 /* RS690M HD Audio */
#define PCI_PRODUCT_ATI_RADEON_HD3600_HDA 0xaa20 /* Radeon HD 3600 HD Audio */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index d049a3d837f..f1ae5ef788f 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: pcidevs,v 1.1454 2009/02/07 02:05:16 jsg Exp
+ * OpenBSD: pcidevs,v 1.1455 2009/02/13 19:56:41 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -112,6 +112,10 @@ static const struct pci_known_product pci_known_products[] = {
"OZ711MP1 CardBus",
},
{
+ PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7135,
+ "OZ711EZ1 CardBus",
+ },
+ {
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ7223,
"OZ711E0 CardBus",
},
@@ -1392,6 +1396,10 @@ static const struct pci_known_product pci_known_products[] = {
"RS780 PCIE",
},
{
+ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_RS780_PCIE_7,
+ "RS780 PCIE",
+ },
+ {
PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID,
"MegaRAID",
},
@@ -3576,7 +3584,11 @@ static const struct pci_known_product pci_known_products[] = {
"RS780 HD Audio",
},
{
- PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200,
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_1,
+ "Radeon HD 3200",
+ },
+ {
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3200_2,
"Radeon HD 3200",
},
{