sync

2 files changed, 98 insertions, 98 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index b4b059912cd..9186ab7f76d 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.396 2001/05/12 08:29:00 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.397 2001/05/15 12:24:41 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -518,7 +518,7 @@
 #define	PCI_VENDOR_STB2	0x12d2		/* NVidia/SGS-Thomson */
 #define	PCI_VENDOR_AUREAL	0x12eb		/* Aureal */
 #define	PCI_VENDOR_ADMTEK	0x1317		/* ADMtek */
-#define	PCI_VENDOR_PE	0x1318		/* Packet Engines Inc. */
+#define	PCI_VENDOR_PE	0x1318		/* Packet Engines */
 #define	PCI_VENDOR_FORTEMEDIA	0x1319		/* Forte Media */
 #define	PCI_VENDOR_SIIG	0x131f		/* SIIG */
 #define	PCI_VENDOR_KAWASAKI	0x136b		/* Kawasaki */
@@ -527,7 +527,7 @@
 #define	PCI_VENDOR_HIFN	0x13a3		/* Hi/Fn */
 #define	PCI_VENDOR_TRIWARE	0x13c1		/* 3ware */
 #define	PCI_VENDOR_SUNDANCE	0x13f0		/* Sundance */
-#define	PCI_VENDOR_CMI	0x13f6		/* C-Media Electronics Inc. */
+#define	PCI_VENDOR_CMI	0x13f6		/* C-Media Electronics */
 #define	PCI_VENDOR_LAVA	0x1407		/* Lava */
 #define	PCI_VENDOR_OXFORD	0x14d2		/* Oxford */
 #define	PCI_VENDOR_INVERTEX	0x14e1		/* Invertex */
@@ -666,7 +666,7 @@
 #define	PCI_PRODUCT_ALI_M5237	0x5237		/* M5237 USB */
 #define	PCI_PRODUCT_ALI_M5247	0x5247		/* M5247 AGP/PCI-PCI */
 #define	PCI_PRODUCT_ALI_M5243	0x5243		/* M5243 AGP/PCI-PCI */
-#define	PCI_PRODUCT_ALI_M7101	0x7101		/* M7101 Power Management */
+#define	PCI_PRODUCT_ALI_M7101	0x7101		/* M7101 Power Mgmt */
 #define	PCI_PRODUCT_ALI_M3309	0x3309		/* M3309 MPEG Accelerator */
 
 /* ADMtek products */
@@ -744,17 +744,17 @@
 #define	PCI_PRODUCT_AMD_SC751_PPB	0x7007		/* 751 PCI-PCI */
 #define	PCI_PRODUCT_AMD_755_ISA	0x7400		/* 755 PCI-ISA */
 #define	PCI_PRODUCT_AMD_755_IDE	0x7401		/* 755 IDE */
-#define	PCI_PRODUCT_AMD_755_PMC	0x7403		/* 755 Power Management */
+#define	PCI_PRODUCT_AMD_755_PMC	0x7403		/* 755 Power Mgmt */
 #define	PCI_PRODUCT_AMD_755_USB	0x7404		/* 755 USB */
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/22548.pdf */
 #define	PCI_PRODUCT_AMD_PBC756_ISA	0x7408		/* 756 PCI-ISA */
 #define	PCI_PRODUCT_AMD_PBC756_IDE	0x7409		/* 756 IDE */
-#define	PCI_PRODUCT_AMD_PBC756_PMC	0x740b		/* 756 Power Management */
+#define	PCI_PRODUCT_AMD_PBC756_PMC	0x740b		/* 756 Power Mgmt */
 #define	PCI_PRODUCT_AMD_PBC756_USB	0x740c		/* 756 USB Host */
 #define	PCI_PRODUCT_AMD_766_ISA	0x7410		/* 766 PCI-ISA */
 #define	PCI_PRODUCT_AMD_766_IDE	0x7411		/* 766 IDE */
 #define	PCI_PRODUCT_AMD_766_USB	0x7412		/* 766 USB */
-#define	PCI_PRODUCT_AMD_766_PMC	0x7413		/* 766 Power Management */
+#define	PCI_PRODUCT_AMD_766_PMC	0x7413		/* 766 Power Mgmt */
 
 /* AMI */
 #define	PCI_PRODUCT_AMI_MEGARAID	0x1960		/* MegaRAID */
@@ -844,8 +844,8 @@
 #define	PCI_PRODUCT_AVANCE2_ALS4000	0x4000		/* ALS4000 */
 
 /* Bit3 products */
-#define	PCI_PRODUCT_BIT3_PCIVME617	0x0001		/* PCI-VME Interface Mod. 617 */
-#define	PCI_PRODUCT_BIT3_PCIVME2706	0x0300		/* PCI-VME Interface Mod. 2706 */
+#define	PCI_PRODUCT_BIT3_PCIVME617	0x0001		/* PCI-VME 617 */
+#define	PCI_PRODUCT_BIT3_PCIVME2706	0x0300		/* PCI-VME 2706 */
 
 /* Bluesteel Networks */
 #define	PCI_PRODUCT_BLUESTEEL_5501	0x0000		/* 5501 */
@@ -1010,26 +1010,26 @@
 #define	PCI_PRODUCT_DAVICOM_DM9102	0x9102		/* DM9102 */
 
 /* DEC products */
-#define	PCI_PRODUCT_DEC_21050	0x0001		/* DECchip 21050 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 */
-#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 */
+#define	PCI_PRODUCT_DEC_21050	0x0001		/* 21050 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21040	0x0002		/* 21040 */
+#define	PCI_PRODUCT_DEC_21030	0x0004		/* 21030 */
 #define	PCI_PRODUCT_DEC_NVRAM	0x0007		/* Zephyr NV-RAM */
 #define	PCI_PRODUCT_DEC_KZPSA	0x0008		/* KZPSA */
-#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 */
+#define	PCI_PRODUCT_DEC_21140	0x0009		/* 21140 */
 #define	PCI_PRODUCT_DEC_PBXGB	0x000d		/* TGA2 */
 #define	PCI_PRODUCT_DEC_DEFPA	0x000f		/* DEFPA */
 /* product DEC ???		0x0010	??? VME Interface */
-#define	PCI_PRODUCT_DEC_21041	0x0014		/* DECchip 21041 */
+#define	PCI_PRODUCT_DEC_21041	0x0014		/* 21041 */
 #define	PCI_PRODUCT_DEC_DGLPB	0x0016		/* DGLPB (OPPO) */
-#define	PCI_PRODUCT_DEC_21142	0x0019		/* DECchip 21142/3 */
+#define	PCI_PRODUCT_DEC_21142	0x0019		/* 21142/3 */
 /* Farallon apparently used DEC's vendor ID by mistake */
 #define	PCI_PRODUCT_DEC_PN9000SX	0x001a		/* Farallon PN9000SX */
-#define	PCI_PRODUCT_DEC_21052	0x0021		/* DECchip 21052 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21150	0x0022		/* DECchip 21150 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21150_BC	0x0023		/* DECchip 21150-BC PCI-PCI */
-#define	PCI_PRODUCT_DEC_21152	0x0024		/* DECchip 21152 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21153	0x0025		/* DECchip 21153 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21154	0x0026		/* DECchip 21154 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21052	0x0021		/* 21052 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21150	0x0022		/* 21150 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21150_BC	0x0023		/* 21150-BC PCI-PCI */
+#define	PCI_PRODUCT_DEC_21152	0x0024		/* 21152 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21153	0x0025		/* 21153 PCI-PCI */
+#define	PCI_PRODUCT_DEC_21154	0x0026		/* 21154 PCI-PCI */
 #define	PCI_PRODUCT_DEC_CPQ42XX	0x0046		/* Compaq SMART RAID 42xx */
 
 /* Delta Electronics products */
@@ -1170,7 +1170,7 @@
 #define	PCI_PRODUCT_INTEL_82840_HB	0x1a21		/* 82840 Host */
 #define	PCI_PRODUCT_INTEL_82840_AGP	0x1a23		/* 82840 AGP */
 #define	PCI_PRODUCT_INTEL_82840_PCI	0x1a24		/* 82840 PCI */
-#define	PCI_PRODUCT_INTEL_82801AA_LPC	0x2410		/* 82801AA LPC Interface */
+#define	PCI_PRODUCT_INTEL_82801AA_LPC	0x2410		/* 82801AA LPC */
 #define	PCI_PRODUCT_INTEL_82801AA_IDE	0x2411		/* 82801AA IDE */
 #define	PCI_PRODUCT_INTEL_82801AA_USB	0x2412		/* 82801AA USB */
 #define	PCI_PRODUCT_INTEL_82801AA_SMB	0x2413		/* 82801AA SMBus */
@@ -1211,7 +1211,7 @@
 #define	PCI_PRODUCT_INTEL_82371AB_ISA	0x7110		/* 82371AB PIIX4 ISA */
 #define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE */
 #define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB */
-#define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Management */
+#define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Mgmt */
 #define	PCI_PRODUCT_INTEL_82810_MCH	0x7120		/* 82810 */
 #define	PCI_PRODUCT_INTEL_82810_GC	0x7121		/* 82810 Graphics */
 #define	PCI_PRODUCT_INTEL_82810_DC100_MCH	0x7122		/* 82810-DC100 */
@@ -1228,7 +1228,7 @@
 #define	PCI_PRODUCT_INTEL_82440MX_ISA	0x7198		/* 82440MX PCI-ISA */
 #define	PCI_PRODUCT_INTEL_82440MX_IDE	0x7199		/* 82440MX IDE */
 #define	PCI_PRODUCT_INTEL_82440MX_USB	0x719a		/* 82440MX USB */
-#define	PCI_PRODUCT_INTEL_82440MX_PM	0x719b		/* 82440MX Power Management */
+#define	PCI_PRODUCT_INTEL_82440MX_PM	0x719b		/* 82440MX Power Mgmt */
 #define	PCI_PRODUCT_INTEL_82440BX	0x71a0		/* 82440BX PCI-AGP */
 #define	PCI_PRODUCT_INTEL_82440BX_AGP	0x71a1		/* 82440BX AGP */
 #define	PCI_PRODUCT_INTEL_82443GX	0x71a2		/* 82443GX */
@@ -1849,9 +1849,9 @@
 #define	PCI_PRODUCT_VIATECH_VT82C416	0x1571		/* VT82C416 IDE */
 #define	PCI_PRODUCT_VIATECH_VT82C1595	0x1595		/* VT82C1595 Host-PCI */
 #define	PCI_PRODUCT_VIATECH_VT83C572	0x3038		/* VT83C572 USB */
-#define	PCI_PRODUCT_VIATECH_VT82C586_PWR	0x3040		/* VT82C586 Power Management */
+#define	PCI_PRODUCT_VIATECH_VT82C586_PWR	0x3040		/* VT82C586 Power Mgmt */
 #define	PCI_PRODUCT_VIATECH_RHINE	0x3043		/* Rhine/RhineII */
-#define	PCI_PRODUCT_VIATECH_VT82C596	0x3050		/* VT82C596 Power Management */
+#define	PCI_PRODUCT_VIATECH_VT82C596	0x3050		/* VT82C596 Power Mgmt */
 #define	PCI_PRODUCT_VIATECH_VT82C686A_SMB	0x3057		/* VT82C686A SMBus */
 #define	PCI_PRODUCT_VIATECH_VT82C686A_AC97	0x3058		/* VT82C686A AC-97 Audio */
 #define	PCI_PRODUCT_VIATECH_RHINEII_2	0x3065		/* RhineII-2 */
@@ -1884,40 +1884,40 @@
 #define	PCI_PRODUCT_VORTEX_GDT_6535	0x000c		/* GDT6535 */
 #define	PCI_PRODUCT_VORTEX_GDT_6555	0x000d		/* GDT6555/6555-ECC */
 /* GDT_MPR, RP series, wide/ultra SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_6x17RP	0x0100		/* GDT6117RP/GDT6517RP */
-#define	PCI_PRODUCT_VORTEX_GDT_6x27RP	0x0101		/* GDT6127RP/GDT6527RP */
+#define	PCI_PRODUCT_VORTEX_GDT_6x17RP	0x0100		/* GDT6[15]17RP */
+#define	PCI_PRODUCT_VORTEX_GDT_6x27RP	0x0101		/* GDT6[15]27RP */
 #define	PCI_PRODUCT_VORTEX_GDT_6537RP	0x0102		/* GDT6537RP */
 #define	PCI_PRODUCT_VORTEX_GDT_6557RP	0x0103		/* GDT6557RP */
 /* GDT_MPR, RP series, narrow/ultra SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_6x11RP	0x0104		/* GDT6111RP/GDT6511RP */
-#define	PCI_PRODUCT_VORTEX_GDT_6x21RP	0x0105		/* GDT6121RP/GDT6521RP */
+#define	PCI_PRODUCT_VORTEX_GDT_6x11RP	0x0104		/* GDT6[15]11RP */
+#define	PCI_PRODUCT_VORTEX_GDT_6x21RP	0x0105		/* GDT6[15]21RP */
 /* GDT_MPR, RD series, wide/ultra SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_6x17RD	0x0110		/* GDT6117RD/GDT6517RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x27RD	0x0111		/* GDT6127RD/GDT6527RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x17RD	0x0110		/* GDT6[15]17RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x27RD	0x0111		/* GDT6[5]127RD */
 #define	PCI_PRODUCT_VORTEX_GDT_6537RD	0x0112		/* GDT6537RD */
 #define	PCI_PRODUCT_VORTEX_GDT_6557RD	0x0113		/* GDT6557RD */
 /* GDT_MPR, RD series, narrow/ultra SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_6x11RD	0x0114		/* GDT6111RD/GDT6511RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x21RD	0x0115		/* GDT6121RD/GDT6521RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x11RD	0x0114		/* GDT6[15]11RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x21RD	0x0115		/* GDT6[15]21RD */
 /* GDT_MPR, RD series, wide/ultra2 SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_6x18RD	0x0118		/* GDT6118RD/GDT6518RD/GDT6618RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x28RD	0x0119		/* GDT6128RD/GDT6528RD/GDT6628RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x38RD	0x011a		/* GDT6538RD/GDT6638RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x58RD	0x011b		/* GDT6558RD/GDT6658RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x18RD	0x0118		/* GDT6[156]18RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x28RD	0x0119		/* GDT6[156]28RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x38RD	0x011a		/* GDT6[56]38RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x58RD	0x011b		/* GDT6[56]58RD */
 /* GDT_MPR, RS series, wide/ultra2 SCSI */
 #define	PCI_PRODUCT_VORTEX_GDT_6518RS	0x0138		/* GDT6518RS */
 /* GDT_MPR, RN series (64-bit PCI), wide/ultra2 SCSI */
-#define	PCI_PRODUCT_VORTEX_GDT_7x18RN	0x0168		/* GDT7118RN/GDT7518RN/GDT7618RN */
-#define	PCI_PRODUCT_VORTEX_GDT_7x28RN	0x0169		/* GDT7128RN/GDT7528RN/GDT7628RN */
-#define	PCI_PRODUCT_VORTEX_GDT_7x38RN	0x016a		/* GDT7538RN/GDT7638RN */
-#define	PCI_PRODUCT_VORTEX_GDT_7x58RN	0x016b		/* GDT7558RN/GDT7658RN */
-#define	PCI_PRODUCT_VORTEX_GDT_7x43RN	0x016d		/* GDT7543RN/GDT7643RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x18RN	0x0168		/* GDT7[156]18RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x28RN	0x0169		/* GDT7[156]28RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x38RN	0x016a		/* GDT7[56]38RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x58RN	0x016b		/* GDT7[56]58RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x43RN	0x016d		/* GDT7[56]43RN */
 /* GDT_MPR, RD series, Fibre Channel */
-#define	PCI_PRODUCT_VORTEX_GDT_6x19RD	0x0210		/* GDT6519RD/GDT6619RD */
-#define	PCI_PRODUCT_VORTEX_GDT_6x29RD	0x0211		/* GDT6529RD/GDT6629RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x19RD	0x0210		/* GDT6[56]19RD */
+#define	PCI_PRODUCT_VORTEX_GDT_6x29RD	0x0211		/* GDT6[56]29RD */
 /* GDT_MPR, RN series (64-bit PCI), Fibre Channel */
-#define	PCI_PRODUCT_VORTEX_GDT_7x19RN	0x0260		/* GDT7519RN/GDT7619RN */
-#define	PCI_PRODUCT_VORTEX_GDT_7x29RN	0x0261		/* GDT7529RN/GDT7629RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x19RN	0x0260		/* GDT7[56]19RN */
+#define	PCI_PRODUCT_VORTEX_GDT_7x29RN	0x0261		/* GDT7[56]29RN */
 
 /* VLSI products */
 #define	PCI_PRODUCT_VLSI_82C592	0x0005		/* 82C592 CPU */
@@ -1960,8 +1960,8 @@
 #define	PCI_PRODUCT_WINBOND2_W89C940	0x1980		/* Linksys EtherPCI */
 
 /* Motorola products */
-#define	PCI_PRODUCT_MOT_MPC105	0x0001		/* MPC105 PPC PCI bridge */
-#define	PCI_PRODUCT_MOT_MPC106	0x0002		/* MPC106 PPC PCI bridge */
+#define	PCI_PRODUCT_MOT_MPC105	0x0001		/* MPC105 PCI bridge */
+#define	PCI_PRODUCT_MOT_MPC106	0x0002		/* MPC106 PCI bridge */
 
 /* Xircom products */
 #define	PCI_PRODUCT_XIRCOM_X3201_3	0x0002		/* X3201-3 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 76902073f3a..47372c00e90 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.396 2001/05/12 08:29:00 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.397 2001/05/15 12:24:41 deraadt Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -340,7 +340,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M7101,
-	    "M7101 Power Management",
+	    "M7101 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M3309,
@@ -596,7 +596,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_755_PMC,
-	    "755 Power Management",
+	    "755 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_755_USB,
@@ -612,7 +612,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_PMC,
-	    "756 Power Management",
+	    "756 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_USB,
@@ -632,7 +632,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_766_PMC,
-	    "766 Power Management",
+	    "766 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID,
@@ -912,11 +912,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME617,
-	    "PCI-VME Interface Mod. 617",
+	    "PCI-VME 617",
 	},
 	{
 	    PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME2706,
-	    "PCI-VME Interface Mod. 2706",
+	    "PCI-VME 2706",
 	},
 	{
 	    PCI_VENDOR_BLUESTEEL, PCI_PRODUCT_BLUESTEEL_5501,
@@ -1392,15 +1392,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21050,
-	    "DECchip 21050 PCI-PCI",
+	    "21050 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21040,
-	    "DECchip 21040",
+	    "21040",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21030,
-	    "DECchip 21030",
+	    "21030",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_NVRAM,
@@ -1412,7 +1412,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21140,
-	    "DECchip 21140",
+	    "21140",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PBXGB,
@@ -1424,7 +1424,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21041,
-	    "DECchip 21041",
+	    "21041",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DGLPB,
@@ -1432,7 +1432,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21142,
-	    "DECchip 21142/3",
+	    "21142/3",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PN9000SX,
@@ -1440,27 +1440,27 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21052,
-	    "DECchip 21052 PCI-PCI",
+	    "21052 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21150,
-	    "DECchip 21150 PCI-PCI",
+	    "21150 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21150_BC,
-	    "DECchip 21150-BC PCI-PCI",
+	    "21150-BC PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21152,
-	    "DECchip 21152 PCI-PCI",
+	    "21152 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21153,
-	    "DECchip 21153 PCI-PCI",
+	    "21153 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21154,
-	    "DECchip 21154 PCI-PCI",
+	    "21154 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_CPQ42XX,
@@ -1852,7 +1852,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_LPC,
-	    "82801AA LPC Interface",
+	    "82801AA LPC",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_IDE,
@@ -2016,7 +2016,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371AB_PMC,
-	    "82371AB Power Management",
+	    "82371AB Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH,
@@ -2084,7 +2084,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_PM,
-	    "82440MX Power Management",
+	    "82440MX Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440BX,
@@ -3908,7 +3908,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_PWR,
-	    "VT82C586 Power Management",
+	    "VT82C586 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINE,
@@ -3916,7 +3916,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C596,
-	    "VT82C596 Power Management",
+	    "VT82C596 Power Mgmt",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_SMB,
@@ -4020,11 +4020,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x17RP,
-	    "GDT6117RP/GDT6517RP",
+	    "GDT6[15]17RP",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x27RP,
-	    "GDT6127RP/GDT6527RP",
+	    "GDT6[15]27RP",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6537RP,
@@ -4036,19 +4036,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x11RP,
-	    "GDT6111RP/GDT6511RP",
+	    "GDT6[15]11RP",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x21RP,
-	    "GDT6121RP/GDT6521RP",
+	    "GDT6[15]21RP",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x17RD,
-	    "GDT6117RD/GDT6517RD",
+	    "GDT6[15]17RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x27RD,
-	    "GDT6127RD/GDT6527RD",
+	    "GDT6[5]127RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6537RD,
@@ -4060,27 +4060,27 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x11RD,
-	    "GDT6111RD/GDT6511RD",
+	    "GDT6[15]11RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x21RD,
-	    "GDT6121RD/GDT6521RD",
+	    "GDT6[15]21RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x18RD,
-	    "GDT6118RD/GDT6518RD/GDT6618RD",
+	    "GDT6[156]18RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x28RD,
-	    "GDT6128RD/GDT6528RD/GDT6628RD",
+	    "GDT6[156]28RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x38RD,
-	    "GDT6538RD/GDT6638RD",
+	    "GDT6[56]38RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x58RD,
-	    "GDT6558RD/GDT6658RD",
+	    "GDT6[56]58RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6518RS,
@@ -4088,39 +4088,39 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x18RN,
-	    "GDT7118RN/GDT7518RN/GDT7618RN",
+	    "GDT7[156]18RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x28RN,
-	    "GDT7128RN/GDT7528RN/GDT7628RN",
+	    "GDT7[156]28RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x38RN,
-	    "GDT7538RN/GDT7638RN",
+	    "GDT7[56]38RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x58RN,
-	    "GDT7558RN/GDT7658RN",
+	    "GDT7[56]58RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x43RN,
-	    "GDT7543RN/GDT7643RN",
+	    "GDT7[56]43RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x19RD,
-	    "GDT6519RD/GDT6619RD",
+	    "GDT6[56]19RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6x29RD,
-	    "GDT6529RD/GDT6629RD",
+	    "GDT6[56]29RD",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x19RN,
-	    "GDT7519RN/GDT7619RN",
+	    "GDT7[56]19RN",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_7x29RN,
-	    "GDT7529RN/GDT7629RN",
+	    "GDT7[56]29RN",
 	},
 	{
 	    PCI_VENDOR_VLSI, PCI_PRODUCT_VLSI_82C592,
@@ -4236,11 +4236,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC105,
-	    "MPC105 PPC PCI bridge",
+	    "MPC105 PCI bridge",
 	},
 	{
 	    PCI_VENDOR_MOT, PCI_PRODUCT_MOT_MPC106,
-	    "MPC106 PPC PCI bridge",
+	    "MPC106 PCI bridge",
 	},
 	{
 	    PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_X3201_3,
@@ -6196,7 +6196,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	},
 	{
 	    PCI_VENDOR_PE,
-	    "Packet Engines Inc.",
+	    "Packet Engines",
 	},
 	{
 	    PCI_VENDOR_FORTEMEDIA,
@@ -6232,7 +6232,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
 	},
 	{
 	    PCI_VENDOR_CMI,
-	    "C-Media Electronics Inc.",
+	    "C-Media Electronics",
 	},
 	{
 	    PCI_VENDOR_LAVA,