sync

2 files changed, 108 insertions, 108 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 52719854230..a7cfacad95b 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -987,15 +987,15 @@
 
 /* DEC products */
 #define	PCI_PRODUCT_DEC_21050	0x0001		/* DECchip 21050 PCI-PCI */
-#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 (Tulip) */
-#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 (TGA) */
+#define	PCI_PRODUCT_DEC_21040	0x0002		/* DECchip 21040 /* Tulip */ */
+#define	PCI_PRODUCT_DEC_21030	0x0004		/* DECchip 21030 /* TGA */ */
 #define	PCI_PRODUCT_DEC_NVRAM	0x0007		/* Zephyr NV-RAM */
 #define	PCI_PRODUCT_DEC_KZPSA	0x0008		/* KZPSA */
-#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 (FasterNet) */
+#define	PCI_PRODUCT_DEC_21140	0x0009		/* DECchip 21140 /* FasterNet */ */
 #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 (Tulip Pass 3) */
+#define	PCI_PRODUCT_DEC_21041	0x0014		/* DECchip 21041 /* Tulip Pass 3 */ */
 #define	PCI_PRODUCT_DEC_DGLPB	0x0016		/* DGLPB (OPPO) */
 #define	PCI_PRODUCT_DEC_21142	0x0019		/* DECchip 21142/3 */
 /* Farallon apparently used DEC's vendor ID by mistake */
@@ -1101,14 +1101,14 @@
 
 /* Intel products */
 #define	PCI_PRODUCT_INTEL_PCEB	0x0482		/* 82375EB PCI-EISA */
-#define	PCI_PRODUCT_INTEL_CDC	0x0483		/* 82424ZX (Saturn) Cache/DRAM */
-#define	PCI_PRODUCT_INTEL_SIO	0x0484		/* 82378IB PCI-ISA (System I/O) */
-#define	PCI_PRODUCT_INTEL_82426EX	0x0486		/* 82426EX PCI-to-ISA (PCIB) */
-#define	PCI_PRODUCT_INTEL_PCMC	0x04a3		/* 82434LX/NX (Mercury/Neptune) PCI/Cache/DRAM */
+#define	PCI_PRODUCT_INTEL_CDC	0x0483		/* 82424ZX Cache/DRAM */
+#define	PCI_PRODUCT_INTEL_SIO	0x0484		/* 82378IB PCI-ISA */
+#define	PCI_PRODUCT_INTEL_82426EX	0x0486		/* 82426EX PCI-to-ISA */
+#define	PCI_PRODUCT_INTEL_PCMC	0x04a3		/* 82434LX/NX PCI/Cache/DRAM */
 #define	PCI_PRODUCT_INTEL_80960RP	0x0960		/* i960 RP PCI-PCI */
 #define	PCI_PRODUCT_INTEL_80960RM	0x0962		/* i960 RM PCI-PCI */
 #define	PCI_PRODUCT_INTEL_80960RN	0x0964		/* i960 RN PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82452	0x1000		/* Pro/1000 */
+#define	PCI_PRODUCT_INTEL_82452	0x1000		/* 82452 Pro/1000 */
 #define	PCI_PRODUCT_INTEL_82815_DC100_HUB	0x1100		/* 82815 Hub */
 #define	PCI_PRODUCT_INTEL_82815_DC100_AGP	0x1101		/* 82815 AGP */
 #define	PCI_PRODUCT_INTEL_82815_DC100_GRAPH	0x1102		/* 82815 Graphics */
@@ -1128,15 +1128,15 @@
 #define	PCI_PRODUCT_INTEL_82557	0x1229		/* 82557 */
 #define	PCI_PRODUCT_INTEL_82559	0x1030		/* 82559 */
 #define	PCI_PRODUCT_INTEL_82806AA_APIC	0x1161		/* 82806AA PCI64 APIC */
-#define	PCI_PRODUCT_INTEL_82437FX	0x122d		/* 82437FX (Triton) */
-#define	PCI_PRODUCT_INTEL_82371FB_ISA	0x122e		/* 82371FB (Triton) PCI-ISA */
-#define	PCI_PRODUCT_INTEL_82371FB_IDE	0x1230		/* 82371FB (Triton) IDE */
-#define	PCI_PRODUCT_INTEL_82371MX	0x1234		/* 82371 (Triton MX) PCI-ISA and IDE */
-#define	PCI_PRODUCT_INTEL_82437MX	0x1235		/* 82437 (Triton MX) PCI/CACHECOMP/DRAM */
+#define	PCI_PRODUCT_INTEL_82437FX	0x122d		/* 82437FX */
+#define	PCI_PRODUCT_INTEL_82371FB_ISA	0x122e		/* 82371FB PCI-ISA */
+#define	PCI_PRODUCT_INTEL_82371FB_IDE	0x1230		/* 82371FB IDE */
+#define	PCI_PRODUCT_INTEL_82371MX	0x1234		/* 82371 PCI-ISA and IDE */
+#define	PCI_PRODUCT_INTEL_82437MX	0x1235		/* 82437 PCI/Cache/DRAM */
 #define	PCI_PRODUCT_INTEL_82441FX	0x1237		/* 82441FX */
 #define	PCI_PRODUCT_INTEL_82380AB	0x123c		/* 82380AB Mobile PCI-ISA */
 #define	PCI_PRODUCT_INTEL_82380FB	0x124b		/* 82380FB Mobile PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX (Triton II) */
+#define	PCI_PRODUCT_INTEL_82439HX	0x1250		/* 82439HX */
 #define	PCI_PRODUCT_INTEL_82806AA	0x1360		/* 82806AA PCI64 */
 #define	PCI_PRODUCT_INTEL_80960RP_ATU	0x1960		/* 80960RP ATU */
 #define	PCI_PRODUCT_INTEL_82840_HB	0x1a21		/* 82840 Host */
@@ -1166,7 +1166,7 @@
 #define	PCI_PRODUCT_INTEL_82801BAM_IDE	0x244a		/* 82801BAM IDE */
 #define	PCI_PRODUCT_INTEL_82801BA_IDE	0x244b		/* 82801BA IDE */
 #define	PCI_PRODUCT_INTEL_82801BA_AGP	0x244e		/* 82801BA AGP */
-#define	PCI_PRODUCT_INTEL_82820_MCH	0x2501		/* 82820 MCH (Camino) */
+#define	PCI_PRODUCT_INTEL_82820_MCH	0x2501		/* 82820 MCH */
 #define	PCI_PRODUCT_INTEL_82820_AGP	0x250f		/* 82820 AGP */
 #define	PCI_PRODUCT_INTEL_82850_HB	0x2530		/* 82850 Host */
 #define	PCI_PRODUCT_INTEL_82860_HB	0x2531		/* 82860 Host */
@@ -1175,15 +1175,15 @@
 #define	PCI_PRODUCT_INTEL_82860_PCI2	0x2534		/* 82860 PCI-PCI */
 #define	PCI_PRODUCT_INTEL_82860_PCI3	0x2535		/* 82860 PCI-PCI */
 #define	PCI_PRODUCT_INTEL_82860_PCI4	0x2536		/* 82860 PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82371SB_ISA	0x7000		/* 82371SB (Triton II) PCI-ISA */
-#define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB (Triton II) IDE */
-#define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB (Triton II) USB */
+#define	PCI_PRODUCT_INTEL_82371SB_ISA	0x7000		/* 82371SB PCI-ISA */
+#define	PCI_PRODUCT_INTEL_82371SB_IDE	0x7010		/* 82371SB IDE */
+#define	PCI_PRODUCT_INTEL_82371USB	0x7020		/* 82371SB USB */
 #define	PCI_PRODUCT_INTEL_82437VX	0x7030		/* 82437VX */
-#define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System (MTXC) */
+#define	PCI_PRODUCT_INTEL_82439TX	0x7100		/* 82439TX System */
 #define	PCI_PRODUCT_INTEL_82371AB_ISA	0x7110		/* 82371AB PIIX4 ISA */
-#define	PCI_PRODUCT_INTEL_82371AB_IDE	0x7111		/* 82371AB IDE (PIIX4) */
-#define	PCI_PRODUCT_INTEL_82371AB_USB	0x7112		/* 82371AB USB (PIIX4) */
-#define	PCI_PRODUCT_INTEL_82371AB_PMC	0x7113		/* 82371AB Power Management (PIIX4) */
+#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_82810_MCH	0x7120		/* 82810 */
 #define	PCI_PRODUCT_INTEL_82810_GC	0x7121		/* 82810 Graphics */
 #define	PCI_PRODUCT_INTEL_82810_DC100_MCH	0x7122		/* 82810-DC100 */
@@ -1205,8 +1205,8 @@
 #define	PCI_PRODUCT_INTEL_82440BX_AGP	0x71a1		/* 82440BX AGP */
 #define	PCI_PRODUCT_INTEL_82443GX	0x71a2		/* 82443GX */
 #define	PCI_PRODUCT_INTEL_82740	0x7800		/* 82740 AGP */
-#define	PCI_PRODUCT_INTEL_PCI450_PB	0x84c4		/* 82450KX/GX (Orion) */
-#define	PCI_PRODUCT_INTEL_PCI450_MC	0x84c5		/* 82450KX/GX (Orion) Memory */
+#define	PCI_PRODUCT_INTEL_PCI450_PB	0x84c4		/* 82450KX/GX */
+#define	PCI_PRODUCT_INTEL_PCI450_MC	0x84c5		/* 82450KX/GX Memory */
 #define	PCI_PRODUCT_INTEL_82451NX	0x84ca		/* 82451NX Mem & IO */
 #define	PCI_PRODUCT_INTEL_82454NX	0x84cb		/* 82454NX PXB */
 #define	PCI_PRODUCT_INTEL_82802AB	0x89ad		/* 82802AB Firmware Hub 4Mbit */
@@ -1728,7 +1728,7 @@
 
 /* Triones/HighPoint Technologies products */
 #define	PCI_PRODUCT_TRIONES_HPT343	0x0003		/* HPT343 EIDE */
-#define	PCI_PRODUCT_TRIONES_HPT366	0x0004		/* HPT366/370 EIDE */
+#define	PCI_PRODUCT_TRIONES_HPT366	0x0004		/* HPT36x/37x EIDE */
 
 /* TriTech Microelectronics products*/
 #define	PCI_PRODUCT_TRITECH_TR25202	0xfc02		/* Pyramid3D TR25202 */
@@ -1772,43 +1772,43 @@
 #define	PCI_PRODUCT_V3_V96DPC	0xC960		/* V96DPC i960 (Dual) Host-PCI */
 
 /* VIA Technologies products */
-#define	PCI_PRODUCT_VIATECH_VT8363	0x0305		/* VT8363 (Apollo 133) Host */
-#define	PCI_PRODUCT_VIATECH_VT8371_HB	0x0391		/* VT8371 (Apollo 133) Host */
-#define	PCI_PRODUCT_VIATECH_VT8501	0x0501		/* VT8501 (Apollo MVP4) */
-#define	PCI_PRODUCT_VIATECH_VT82C505	0x0505		/* VT82C505 (Pluto) */
+#define	PCI_PRODUCT_VIATECH_VT8363	0x0305		/* VT8363 Host */
+#define	PCI_PRODUCT_VIATECH_VT8371_HB	0x0391		/* VT8371 Host */
+#define	PCI_PRODUCT_VIATECH_VT8501	0x0501		/* VT8501 */
+#define	PCI_PRODUCT_VIATECH_VT82C505	0x0505		/* VT82C505 */
 #define	PCI_PRODUCT_VIATECH_VT82C561	0x0561		/* VT82C561 */
 #define	PCI_PRODUCT_VIATECH_VT82C586A_IDE	0x0571		/* VT82C586A IDE */
 #define	PCI_PRODUCT_VIATECH_VT82C576	0x0576		/* VT82C576 3V */
-#define	PCI_PRODUCT_VIATECH_VT82C585	0x0585		/* VT82C585 (Apollo) PCI-ISA */
-#define	PCI_PRODUCT_VIATECH_VT82C586_ISA	0x0586		/* VT82C586 (Apollo VP) PCI-ISA */
-#define	PCI_PRODUCT_VIATECH_VT82C595	0x0595		/* VT82C595 (Apollo VP2) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT82C596A	0x0596		/* VT82C596A (Apollo Pro) PCI-ISA */
-#define	PCI_PRODUCT_VIATECH_VT82C597PCI	0x0597		/* VT82C597 (Apollo VP3) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT82C598PCI	0x0598		/* VT82C598 (Apollo MVP3) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT8605	0x0605		/* VT8605 (ProSavage PM133) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT82C686A_ISA	0x0686		/* VT82C686A (Apollo 133) PCI-ISA */
-#define	PCI_PRODUCT_VIATECH_VT82C691	0x0691		/* VT82C691 (Apollo Pro) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT82C693	0x0693		/* VT82C693 (Apollo Pro Plus) Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C585	0x0585		/* VT82C585 PCI-ISA */
+#define	PCI_PRODUCT_VIATECH_VT82C586_ISA	0x0586		/* VT82C586 PCI-ISA */
+#define	PCI_PRODUCT_VIATECH_VT82C595	0x0595		/* VT82C595 Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C596A	0x0596		/* VT82C596A PCI-ISA */
+#define	PCI_PRODUCT_VIATECH_VT82C597PCI	0x0597		/* VT82C597 Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C598PCI	0x0598		/* VT82C598 Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT8605	0x0605		/* VT8605 Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C686A_ISA	0x0686		/* VT82C686A PCI-ISA */
+#define	PCI_PRODUCT_VIATECH_VT82C691	0x0691		/* VT82C691 Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C693	0x0693		/* VT82C693 Host-PCI */
 #define	PCI_PRODUCT_VIATECH_VT86C926	0x0926		/* VT86C926 Amazon */
-#define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M (Apollo) Host-PCI */
-#define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M (Apollo) PCI-ISA */
-#define	PCI_PRODUCT_VIATECH_VT82C586_IDE	0x1571		/* VT82C586 (Apollo VP) IDE */
-#define	PCI_PRODUCT_VIATECH_VT82C1595	0x1595		/* VT82C1595 (Apollo VP2) Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C570M	0x1000		/* VT82C570M Host-PCI */
+#define	PCI_PRODUCT_VIATECH_VT82C570MV	0x1006		/* VT82C570M PCI-ISA */
+#define	PCI_PRODUCT_VIATECH_VT82C586_IDE	0x1571		/* VT82C586 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 (Apollo VP) Power Management */
+#define	PCI_PRODUCT_VIATECH_VT82C586_PWR	0x3040		/* VT82C586 Power Management */
 #define	PCI_PRODUCT_VIATECH_RHINE	0x3043		/* Rhine/RhineII */
 #define	PCI_PRODUCT_VIATECH_VT82C596	0x3050		/* VT82C596 Power Management */
-#define	PCI_PRODUCT_VIATECH_VT82C686A_SMB	0x3057		/* VT82C686A (Apollo 133) SMBus */
-#define	PCI_PRODUCT_VIATECH_VT82C686A_AC97	0x3058		/* VT82C686A (Apollo 133) AC-97 Audio */
+#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 */
-#define	PCI_PRODUCT_VIATECH_VT82C686A_ACM	0x3068		/* VT82C686A (Apollo 133) AC-97 Modem */
+#define	PCI_PRODUCT_VIATECH_VT82C686A_ACM	0x3068		/* VT82C686A AC-97 Modem */
 #define	PCI_PRODUCT_VIATECH_RHINEII	0x6100		/* RhineII */
-#define	PCI_PRODUCT_VIATECH_VT8363_AGP	0x8305		/* VT8363 (Apollo 133) PCI-AGP */
-#define	PCI_PRODUCT_VIATECH_VT8371_PPB	0x8391		/* VT8371 (Apollo 133) PCI-PCI */
-#define	PCI_PRODUCT_VIATECH_VT8501_AGP	0x8501		/* VT8501 (Apollo MVP4) PCI-AGP */
-#define	PCI_PRODUCT_VIATECH_VT82C597AGP	0x8597		/* VT82C597 (Apollo VP3) PCI-AGP */
-#define	PCI_PRODUCT_VIATECH_VT82C598AGP	0x8598		/* VT82C598 (Apollo MVP3) PCI-AGP */
-#define	PCI_PRODUCT_VIATECH_VT8605_AGP	0x8605		/* VT8605 (ProSavage PM133) PCI-AGP */
+#define	PCI_PRODUCT_VIATECH_VT8363_AGP	0x8305		/* VT8363 PCI-AGP */
+#define	PCI_PRODUCT_VIATECH_VT8371_PPB	0x8391		/* VT8371 PCI-PCI */
+#define	PCI_PRODUCT_VIATECH_VT8501_AGP	0x8501		/* VT8501 PCI-AGP */
+#define	PCI_PRODUCT_VIATECH_VT82C597AGP	0x8597		/* VT82C597 PCI-AGP */
+#define	PCI_PRODUCT_VIATECH_VT82C598AGP	0x8598		/* VT82C598 PCI-AGP */
+#define	PCI_PRODUCT_VIATECH_VT8605_AGP	0x8605		/* VT8605 PCI-AGP */
 
 /* Vortex Computer Systems products */
 /* GDT_PCI */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index c3d347956c3..a03c8bb141c 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1328,11 +1328,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21040,
-	    "DECchip 21040 (Tulip)",
+	    "DECchip 21040 /* Tulip */",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21030,
-	    "DECchip 21030 (TGA)",
+	    "DECchip 21030 /* TGA */",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_NVRAM,
@@ -1344,7 +1344,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21140,
-	    "DECchip 21140 (FasterNet)",
+	    "DECchip 21140 /* FasterNet */",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PBXGB,
@@ -1356,7 +1356,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21041,
-	    "DECchip 21041 (Tulip Pass 3)",
+	    "DECchip 21041 /* Tulip Pass 3 */",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DGLPB,
@@ -1604,19 +1604,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CDC,
-	    "82424ZX (Saturn) Cache/DRAM",
+	    "82424ZX Cache/DRAM",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SIO,
-	    "82378IB PCI-ISA (System I/O)",
+	    "82378IB PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82426EX,
-	    "82426EX PCI-to-ISA (PCIB)",
+	    "82426EX PCI-to-ISA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCMC,
-	    "82434LX/NX (Mercury/Neptune) PCI/Cache/DRAM",
+	    "82434LX/NX PCI/Cache/DRAM",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP,
@@ -1632,7 +1632,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82452,
-	    "Pro/1000",
+	    "82452 Pro/1000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_HUB,
@@ -1712,23 +1712,23 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437FX,
-	    "82437FX (Triton)",
+	    "82437FX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_ISA,
-	    "82371FB (Triton) PCI-ISA",
+	    "82371FB PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371FB_IDE,
-	    "82371FB (Triton) IDE",
+	    "82371FB IDE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371MX,
-	    "82371 (Triton MX) PCI-ISA and IDE",
+	    "82371 PCI-ISA and IDE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437MX,
-	    "82437 (Triton MX) PCI/CACHECOMP/DRAM",
+	    "82437 PCI/Cache/DRAM",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82441FX,
@@ -1744,7 +1744,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439HX,
-	    "82439HX (Triton II)",
+	    "82439HX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82806AA,
@@ -1864,7 +1864,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_MCH,
-	    "82820 MCH (Camino)",
+	    "82820 MCH",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82820_AGP,
@@ -1900,15 +1900,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_ISA,
-	    "82371SB (Triton II) PCI-ISA",
+	    "82371SB PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371SB_IDE,
-	    "82371SB (Triton II) IDE",
+	    "82371SB IDE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371USB,
-	    "82371SB (Triton II) USB",
+	    "82371SB USB",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437VX,
@@ -1916,7 +1916,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439TX,
-	    "82439TX System (MTXC)",
+	    "82439TX System",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371AB_ISA,
@@ -1924,15 +1924,15 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371AB_IDE,
-	    "82371AB IDE (PIIX4)",
+	    "82371AB IDE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371AB_USB,
-	    "82371AB USB (PIIX4)",
+	    "82371AB USB",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371AB_PMC,
-	    "82371AB Power Management (PIIX4)",
+	    "82371AB Power Management",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82810_MCH,
@@ -2020,11 +2020,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCI450_PB,
-	    "82450KX/GX (Orion)",
+	    "82450KX/GX",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCI450_MC,
-	    "82450KX/GX (Orion) Memory",
+	    "82450KX/GX Memory",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82451NX,
@@ -3540,7 +3540,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_TRIONES, PCI_PRODUCT_TRIONES_HPT366,
-	    "HPT366/370 EIDE",
+	    "HPT36x/37x EIDE",
 	},
 	{
 	    PCI_VENDOR_TRITECH, PCI_PRODUCT_TRITECH_TR25202,
@@ -3660,19 +3660,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363,
-	    "VT8363 (Apollo 133) Host",
+	    "VT8363 Host",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_HB,
-	    "VT8371 (Apollo 133) Host",
+	    "VT8371 Host",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501,
-	    "VT8501 (Apollo MVP4)",
+	    "VT8501",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C505,
-	    "VT82C505 (Pluto)",
+	    "VT82C505",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C561,
@@ -3688,43 +3688,43 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C585,
-	    "VT82C585 (Apollo) PCI-ISA",
+	    "VT82C585 PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_ISA,
-	    "VT82C586 (Apollo VP) PCI-ISA",
+	    "VT82C586 PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C595,
-	    "VT82C595 (Apollo VP2) Host-PCI",
+	    "VT82C595 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C596A,
-	    "VT82C596A (Apollo Pro) PCI-ISA",
+	    "VT82C596A PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597PCI,
-	    "VT82C597 (Apollo VP3) Host-PCI",
+	    "VT82C597 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C598PCI,
-	    "VT82C598 (Apollo MVP3) Host-PCI",
+	    "VT82C598 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605,
-	    "VT8605 (ProSavage PM133) Host-PCI",
+	    "VT8605 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ISA,
-	    "VT82C686A (Apollo 133) PCI-ISA",
+	    "VT82C686A PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C691,
-	    "VT82C691 (Apollo Pro) Host-PCI",
+	    "VT82C691 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C693,
-	    "VT82C693 (Apollo Pro Plus) Host-PCI",
+	    "VT82C693 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C926,
@@ -3732,19 +3732,19 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570M,
-	    "VT82C570M (Apollo) Host-PCI",
+	    "VT82C570M Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C570MV,
-	    "VT82C570M (Apollo) PCI-ISA",
+	    "VT82C570M PCI-ISA",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_IDE,
-	    "VT82C586 (Apollo VP) IDE",
+	    "VT82C586 IDE",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C1595,
-	    "VT82C1595 (Apollo VP2) Host-PCI",
+	    "VT82C1595 Host-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT83C572,
@@ -3752,7 +3752,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_PWR,
-	    "VT82C586 (Apollo VP) Power Management",
+	    "VT82C586 Power Management",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINE,
@@ -3764,11 +3764,11 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_SMB,
-	    "VT82C686A (Apollo 133) SMBus",
+	    "VT82C686A SMBus",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_AC97,
-	    "VT82C686A (Apollo 133) AC-97 Audio",
+	    "VT82C686A AC-97 Audio",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII_2,
@@ -3776,7 +3776,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ACM,
-	    "VT82C686A (Apollo 133) AC-97 Modem",
+	    "VT82C686A AC-97 Modem",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII,
@@ -3784,27 +3784,27 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363_AGP,
-	    "VT8363 (Apollo 133) PCI-AGP",
+	    "VT8363 PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_PPB,
-	    "VT8371 (Apollo 133) PCI-PCI",
+	    "VT8371 PCI-PCI",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501_AGP,
-	    "VT8501 (Apollo MVP4) PCI-AGP",
+	    "VT8501 PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP,
-	    "VT82C597 (Apollo VP3) PCI-AGP",
+	    "VT82C597 PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C598AGP,
-	    "VT82C598 (Apollo MVP3) PCI-AGP",
+	    "VT82C598 PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605_AGP,
-	    "VT8605 (ProSavage PM133) PCI-AGP",
+	    "VT8605 PCI-AGP",
 	},
 	{
 	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_60x0,