sync

2 files changed, 26 insertions, 26 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 00fa1171b61..4e44c3049b0 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.719 2004/04/06 16:07:04 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.720 2004/04/06 16:09:13 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1114,8 +1114,8 @@
 #define	PCI_PRODUCT_INTEL_21145	0x0039		/* 21145 */
 #define	PCI_PRODUCT_INTEL_EESISA	0x0008		/* EES ISA */
 #define	PCI_PRODUCT_INTEL_80312	0x030d		/* 80312 I/O Companion */
-#define	PCI_PRODUCT_INTEL_E7710_PXH_HUB_A	0x0329		/* PCIE to PCIX Bridge Hub A */
-#define	PCI_PRODUCT_INTEL_E7710_PXH_HUB_B	0x032a		/* PCIE to PCIX Bridge Hub B */
+#define	PCI_PRODUCT_INTEL_E7710_PXH_HUB_A	0x0329		/* PCIE-PCIX Bridge Hub A */
+#define	PCI_PRODUCT_INTEL_E7710_PXH_HUB_B	0x032a		/* PCIE-PCIX Bridge Hub B */
 #define	PCI_PRODUCT_INTEL_IOP331_C0	0x0330		/* IOP331 Channel 0 */
 #define	PCI_PRODUCT_INTEL_IOP331_C1	0x0332		/* IOP331 Channel 1 */
 #define	PCI_PRODUCT_INTEL_PCEB	0x0482		/* 82375EB EISA */
@@ -1316,16 +1316,16 @@
 #define	PCI_PRODUCT_INTEL_82855PE	0x3340		/* 82855PE Hub */
 #define	PCI_PRODUCT_INTEL_82855PE_AGP	0x3341		/* 82855PE AGP */
 #define	PCI_PRODUCT_INTEL_RCU32	0x3092		/* RCU32 I2O RAID */
-#define	PCI_PRODUCT_INTEL_E7710_SMCH	0x3590		/* E7710 Server Memory Controller Hub */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_ERR	0x3591		/* E7710 MCH Error Reporting Register */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_DMA	0x3594		/* E7710 MCH DMA Register */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0	0x3595		/* E7710 MCH PCI Express Port A0 */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1	0x3596		/* E7710 MCH PCI Express Port A1 */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0	0x3597		/* E7710 MCH PCI Express Port B0 */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1	0x3598		/* E7710 MCH PCI Express Port B1 */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0	0x3599		/* E7710 MCH PCI Express Port C0 */
-#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1	0x359a		/* E7710 MCH PCI Express Port C1 */
-#define	PCI_PRODUCT_INTEL_E7710_WMCH	0x359e		/* E7710 Workstation Memory Controller Hub */
+#define	PCI_PRODUCT_INTEL_E7710_SMCH	0x3590		/* E7710 SMCH */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_ERR	0x3591		/* E7710 MCH ERR */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_DMA	0x3594		/* E7710 MCH DMA */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0	0x3595		/* E7710 MCH PCIE Port A0 */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1	0x3596		/* E7710 MCH PCIE Port A1 */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0	0x3597		/* E7710 MCH PCIE Port B0 */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1	0x3598		/* E7710 MCH PCIE Port B1 */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0	0x3599		/* E7710 MCH PCIE Port C0 */
+#define	PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1	0x359a		/* E7710 MCH PCIE Port C1 */
+#define	PCI_PRODUCT_INTEL_E7710_WMCH	0x359e		/* E7710 WMCH */
 #define	PCI_PRODUCT_INTEL_82371SB_ISA	0x7000		/* 82371SB ISA */
 #define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB IDE */
 #define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB USB */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 4e1e2386c36..9ecf48981a8 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.719 2004/04/06 16:07:04 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.720 2004/04/06 16:09:13 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -2672,11 +2672,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_PXH_HUB_A,
-	    "PCIE to PCIX Bridge Hub A",
+	    "PCIE-PCIX Bridge Hub A",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_PXH_HUB_B,
-	    "PCIE to PCIX Bridge Hub B",
+	    "PCIE-PCIX Bridge Hub B",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IOP331_C0,
@@ -3480,43 +3480,43 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_SMCH,
-	    "E7710 Server Memory Controller Hub",
+	    "E7710 SMCH",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_ERR,
-	    "E7710 MCH Error Reporting Register",
+	    "E7710 MCH ERR",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_DMA,
-	    "E7710 MCH DMA Register",
+	    "E7710 MCH DMA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEA0,
-	    "E7710 MCH PCI Express Port A0",
+	    "E7710 MCH PCIE Port A0",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEA1,
-	    "E7710 MCH PCI Express Port A1",
+	    "E7710 MCH PCIE Port A1",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEB0,
-	    "E7710 MCH PCI Express Port B0",
+	    "E7710 MCH PCIE Port B0",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEB1,
-	    "E7710 MCH PCI Express Port B1",
+	    "E7710 MCH PCIE Port B1",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEC0,
-	    "E7710 MCH PCI Express Port C0",
+	    "E7710 MCH PCIE Port C0",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_MCH_PCIEC1,
-	    "E7710 MCH PCI Express Port C1",
+	    "E7710 MCH PCIE Port C1",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_E7710_WMCH,
-	    "E7710 Workstation Memory Controller Hub",
+	    "E7710 WMCH",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_ISA,