summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/pci/pcidevs.h26
-rw-r--r--sys/dev/pci/pcidevs_data.h26
2 files changed, 26 insertions, 26 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 5a419317057..2ff7f0c2400 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.1110 2006/07/23 01:05:28 brad Exp
+ * OpenBSD: pcidevs,v 1.1111 2006/07/23 01:30:29 brad Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -2737,11 +2737,11 @@
#define PCI_PRODUCT_NVIDIA_MCP61_PPB_2 0x03e9 /* MCP61 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee /* MCP61 LAN */
#define PCI_PRODUCT_NVIDIA_MCP61_LAN4 0x03ef /* MCP61 LAN */
-#define PCI_PRODUCT_NVIDIA_MCP61_SATA_2 0x03f6 /* MCP61 SATA */
-#define PCI_PRODUCT_NVIDIA_MCP61_SATA_3 0x03f7 /* MCP61 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP61_SATA2 0x03f6 /* MCP61 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP61_SATA3 0x03f7 /* MCP61 SATA */
#define PCI_PRODUCT_NVIDIA_MCP65_ISA 0x0440 /* MCP65 ISA */
-#define PCI_PRODUCT_NVIDIA_MCP65_MEM_1 0x0444 /* MCP65 Memory */
-#define PCI_PRODUCT_NVIDIA_MCP65_MEM_2 0x0445 /* MCP65 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP65_MEM 0x0444 /* MCP65 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP65_MEM2 0x0445 /* MCP65 Memory */
#define PCI_PRODUCT_NVIDIA_MCP65_SMB 0x0446 /* MCP65 SMBus */
#define PCI_PRODUCT_NVIDIA_MCP65_IDE 0x0448 /* MCP65 IDE */
#define PCI_PRODUCT_NVIDIA_MCP65_PCI 0x0449 /* MCP65 PCI */
@@ -2751,10 +2751,10 @@
#define PCI_PRODUCT_NVIDIA_MCP65_AHCI_2 0x044d /* MCP65 AHCI */
#define PCI_PRODUCT_NVIDIA_MCP65_AHCI_3 0x044e /* MCP65 AHCI */
#define PCI_PRODUCT_NVIDIA_MCP65_AHCI_4 0x044f /* MCP65 AHCI */
-#define PCI_PRODUCT_NVIDIA_MCP65_LAN_1 0x0450 /* MCP65 LAN */
-#define PCI_PRODUCT_NVIDIA_MCP65_LAN_2 0x0451 /* MCP65 LAN */
-#define PCI_PRODUCT_NVIDIA_MCP65_LAN_3 0x0452 /* MCP65 LAN */
-#define PCI_PRODUCT_NVIDIA_MCP65_LAN_4 0x0453 /* MCP65 LAN */
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN1 0x0450 /* MCP65 LAN */
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN2 0x0451 /* MCP65 LAN */
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN3 0x0452 /* MCP65 LAN */
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN4 0x0453 /* MCP65 LAN */
#define PCI_PRODUCT_NVIDIA_MCP65_USB_1 0x0454 /* MCP65 USB */
#define PCI_PRODUCT_NVIDIA_MCP65_USB_2 0x0455 /* MCP65 USB */
#define PCI_PRODUCT_NVIDIA_MCP65_USB_3 0x0456 /* MCP65 USB */
@@ -2762,10 +2762,10 @@
#define PCI_PRODUCT_NVIDIA_MCP65_PPB_1 0x0458 /* MCP65 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP65_PPB_2 0x0459 /* MCP65 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP65_PPB_3 0x045a /* MCP65 PCIE */
-#define PCI_PRODUCT_NVIDIA_MCP65_SATA_1 0x045c /* MCP65 SATA */
-#define PCI_PRODUCT_NVIDIA_MCP65_SATA_2 0x045d /* MCP65 SATA */
-#define PCI_PRODUCT_NVIDIA_MCP65_SATA_3 0x045e /* MCP65 SATA */
-#define PCI_PRODUCT_NVIDIA_MCP65_SATA_4 0x045f /* MCP65 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP65_SATA 0x045c /* MCP65 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP65_SATA2 0x045d /* MCP65 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP65_SATA3 0x045e /* MCP65 SATA */
+#define PCI_PRODUCT_NVIDIA_MCP65_SATA4 0x045f /* MCP65 SATA */
/* Oak Technologies products */
#define PCI_PRODUCT_OAKTECH_OTI1007 0x0107 /* OTI107 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 16c07f19bed..3e9bb2d9768 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.1110 2006/07/23 01:05:28 brad Exp
+ * OpenBSD: pcidevs,v 1.1111 2006/07/23 01:30:29 brad Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -8407,11 +8407,11 @@ static const struct pci_known_product pci_known_products[] = {
"MCP61 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_SATA_2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_SATA2,
"MCP61 SATA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_SATA_3,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_SATA3,
"MCP61 SATA",
},
{
@@ -8419,11 +8419,11 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 ISA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM_1,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM,
"MCP65 Memory",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM_2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM2,
"MCP65 Memory",
},
{
@@ -8463,19 +8463,19 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 AHCI",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN_1,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN1,
"MCP65 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN_2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN2,
"MCP65 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN_3,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN3,
"MCP65 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN_4,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN4,
"MCP65 LAN",
},
{
@@ -8507,19 +8507,19 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 PCIE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA_1,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA,
"MCP65 SATA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA_2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA2,
"MCP65 SATA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA_3,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA3,
"MCP65 SATA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA_4,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA4,
"MCP65 SATA",
},
{