shorten many names to cope with uvm code growth

ok jsg

1 files changed, 226 insertions, 226 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 66b39c692bc..1354946479d 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1679 2013/06/06 15:58:42 jsg Exp $
+$OpenBSD: pcidevs,v 1.1680 2013/06/09 18:09:34 deraadt Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -385,8 +385,8 @@ product O2MICRO OZ7223		0x7223	OZ711E0 CardBus
 /* 3Com Products */
 product 3COM 3C985		0x0001	3c985
 product 3COM 3C996		0x0003	3c996
-product 3COM 3CRDAG675		0x0013	3CRDAG675 (Atheros AR5212)
-product 3COM2 3CRPAG175		0x0013	3CRPAG175 (Atheros AR5212)
+product 3COM 3CRDAG675		0x0013	3CRDAG675
+product 3COM2 3CRPAG175		0x0013	3CRPAG175
 product 3COM 3C_MPCI_MODEM	0x1007	V.90 Modem
 product 3COM 3C940		0x1700	3c940
 product 3COM 3C339		0x3390	3c339
@@ -548,7 +548,7 @@ product ALI M5239		0x5239	M5239 USB2
 product ALI M5243		0x5243	M5243 AGP/PCI-PCI
 product ALI M5246		0x5246	M5246 AGP
 product ALI M5247		0x5247	M5247 AGP/PCI-PC
-product ALI M5249		0x5249	M5249 PCI-PCI
+product ALI M5249		0x5249	M5249
 product ALI M524B		0x524b	M524B PCIE
 product ALI M524C		0x524c	M524C PCIE
 product ALI M524D		0x524d	M524D PCIE
@@ -734,12 +734,12 @@ product AMD HUDSON2_PCIE_2	0x43a1	Hudson-2 PCIE
 product AMD HUDSON2_PCIE_3	0x43a2	Hudson-2 PCIE
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/21910.pdf */
 product AMD SC751_SC		0x7006	751 System
-product AMD SC751_PPB		0x7007	751 PCI-PCI
+product AMD SC751_PPB		0x7007	751
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/24462.pdf */
 product AMD 762_PCHB		0x700c	762 PCI
-product AMD 762_PPB		0x700d	762 PCI-PCI
+product AMD 762_PPB		0x700d	762
 product AMD 761_PCHB		0x700e	761 PCI
-product AMD 761_PPB		0x700f	761 PCI-PCI
+product AMD 761_PPB		0x700f	761
 product AMD 755_ISA		0x7400	755 ISA
 product AMD 755_IDE		0x7401	755 IDE
 product AMD 755_PMC		0x7403	755 Power
@@ -759,7 +759,7 @@ product AMD PBC768_IDE		0x7441	768 IDE
 product AMD PBC768_PMC		0x7443	768 Power
 product AMD PBC768_ACA		0x7445	768 AC97
 product AMD PBC768_MD		0x7446	768 Modem
-product AMD PBC768_PPB		0x7448	768 PCI-PCI
+product AMD PBC768_PPB		0x7448	768
 product AMD PBC768_USB		0x7449	768 USB
 product AMD 8131_PCIX		0x7450	8131 PCIX
 product AMD 8131_PCIX_IOAPIC	0x7451	8131 PCIX IOAPIC
@@ -767,7 +767,7 @@ product AMD 8151_SC		0x7454	8151 Sys Control
 product AMD 8151_AGP		0x7455	8151 AGP
 product AMD 8132_PCIX		0x7458	8132 PCIX
 product AMD 8132_PCIX_IOAPIC	0x7459	8132 PCIX IOAPIC
-product AMD 8111_PPB		0x7460	8111 PCI-PCI
+product AMD 8111_PPB		0x7460	8111
 product AMD 8111_ETHER		0x7462	8111 Ether
 product AMD 8111_EHCI		0x7463	8111 USB
 product AMD 8111_USB		0x7464	8111 USB
@@ -852,11 +852,11 @@ product APPLE K2_USB		0x0040	K2 USB
 product APPLE K2_MACIO		0x0041	K2 Macio
 product APPLE K2_FW		0x0042	K2 Firewire
 product APPLE K2_ATA		0x0043	K2 ATA
-product APPLE U3_PPB1		0x0045	U3 PCI-PCI
-product APPLE U3_PPB2		0x0046	U3 PCI-PCI
-product APPLE U3_PPB3		0x0047	U3 PCI-PCI
-product APPLE U3_PPB4		0x0048	U3 PCI-PCI
-product APPLE U3_PPB5		0x0049	U3 PCI-PCI
+product APPLE U3_PPB1		0x0045	U3
+product APPLE U3_PPB2		0x0046	U3
+product APPLE U3_PPB3		0x0047	U3
+product APPLE U3_PPB4		0x0048	U3
+product APPLE U3_PPB5		0x0049	U3
 product APPLE U3_HT		0x004a 	U3 HyperTransport
 product APPLE U3_AGP		0x004b	U3 AGP
 product APPLE K2_GMAC		0x004c	K2 GMAC
@@ -897,7 +897,7 @@ product ARECA ARC1130		0x1130	ARC-1130
 product ARECA ARC1160		0x1160	ARC-1160
 product ARECA ARC1170		0x1170	ARC-1170
 product ARECA ARC1200		0x1200	ARC-1200
-product ARECA ARC1200_B		0x1201	ARC-1200 rev B
+product ARECA ARC1200_B		0x1201	ARC-1200B
 product ARECA ARC1202		0x1202	ARC-1202
 product ARECA ARC1210		0x1210	ARC-1210
 product ARECA ARC1220		0x1220	ARC-1220
@@ -1236,7 +1236,7 @@ product ATI RADEON_RS400_B	0x5a42	Radeon XPRESS 200M
 product ATI RADEON_RC410	0x5a61	Radeon XPRESS 200
 product ATI RADEON_RC410_B	0x5a62	Radeon XPRESS 200M
 product ATI RADEON_X300		0x5b60	Radeon X300
-product ATI RADEON_X600_RV370	0x5b62	Radeon X600 (RV370)
+product ATI RADEON_X600_RV370	0x5b62	Radeon X600
 product ATI RADEON_X550		0x5b63	Radeon X550
 product ATI FIREGL_RV370	0x5b64	FireGL V3100
 product ATI FIREMV_2200_5B65	0x5b65	FireMV 2200 5B65
@@ -1442,7 +1442,7 @@ product ATI MOBILITY_HD5430	0x68e1	Radeon Mobility HD 5430
 product ATI RADEON_HD6370M	0x68e4	Radeon HD 6370M
 product ATI RADEON_HD6330M	0x68e5	Radeon HD 6330M
 product ATI CEDAR		0x68e8	Cedar
-product ATI FIREPRO_CEDAR	0x68e9	FirePro (Cedar)
+product ATI FIREPRO_CEDAR	0x68e9	FirePro
 product ATI FIREPRO_2460	0x68f1	FirePro 2460
 product ATI FIREPRO_2270	0x68f2	FirePro 2270
 product ATI RADEON_HD7300	0x68f8	Radeon HD 7300
@@ -1780,12 +1780,12 @@ product ATHEROS AR9227		0x002d	AR9227
 product ATHEROS AR9287		0x002e	AR9287
 product ATHEROS AR9300		0x0030	AR9300
 product ATHEROS AR9485		0x0032	AR9485
-product ATHEROS AR5210_AP	0x0207	AR5210 (Early)
-product ATHEROS AR5212_IBM	0x1014	AR5212 (IBM MiniPCI)
-product ATHEROS AR5210_DEFAULT	0x1107	AR5210 (no eeprom)
-product ATHEROS AR5212_DEFAULT	0x1113	AR5212 (no eeprom)
-product ATHEROS AR5211_DEFAULT	0x1112	AR5211 (no eeprom)
-product ATHEROS AR5212_FPGA	0xf013	AR5212 (emulation board)
+product ATHEROS AR5210_AP	0x0207	AR5210
+product ATHEROS AR5212_IBM	0x1014	AR5212
+product ATHEROS AR5210_DEFAULT	0x1107	AR5210
+product ATHEROS AR5212_DEFAULT	0x1113	AR5212
+product ATHEROS AR5211_DEFAULT	0x1112	AR5211
+product ATHEROS AR5212_FPGA	0xf013	AR5212
 product ATHEROS AR5211_FPGA11B	0xf11b	AR5211Ref
 product ATHEROS AR5211_LEGACY	0xff12	AR5211Ref
 
@@ -2189,7 +2189,7 @@ product CREATIVELABS SBLIVE	0x0002	SoundBlaster Live
 product CREATIVELABS AWE64D	0x0003	SoundBlaster AWE64D
 product CREATIVELABS AUDIGY	0x0004	SoundBlaster Audigy
 product CREATIVELABS XFI	0x0005	SoundBlaster X-Fi
-product CREATIVELABS SBLIVE2	0x0006	SoundBlaster Live (Dell)
+product CREATIVELABS SBLIVE2	0x0006	SoundBlaster Live
 product CREATIVELABS AUDIGYLS	0x0007	SoundBlaster Audigy LS
 product CREATIVELABS AUDIGY2	0x0008	SoundBlaster Audigy 2
 product CREATIVELABS XFI_XTREME	0x0009	SoundBlaster X-Fi Xtreme
@@ -2236,7 +2236,7 @@ product DCI APCI4		0x0001	PCCOM 4-port
 product DCI APCI8		0x0002	PCCOM 8-port
 
 /* DEC products */
-product DEC 21050		0x0001	21050 PCI-PCI
+product DEC 21050		0x0001	21050
 product DEC 21040		0x0002	21040
 product DEC 21030		0x0004	21030
 product DEC NVRAM		0x0007	Zephyr NV-RAM
@@ -2245,19 +2245,19 @@ product DEC 21140		0x0009	21140
 product DEC PBXGB		0x000d	TGA2
 product DEC DEFPA		0x000f	DEFPA
 product DEC 21041		0x0014	21041
-product DEC DGLPB		0x0016	DGLPB (OPPO)
-product DEC ZLXPL2		0x0017	ZLXP-L2 (Pixelvision)
+product DEC DGLPB		0x0016	DGLPB
+product DEC ZLXPL2		0x0017	ZLXP-L2
 product DEC MC			0x0018	Memory Channel Cluster Controller
 product DEC 21142		0x0019	21142/3
 /* Farallon apparently used DEC's vendor ID by mistake */
 product DEC PN9000SX		0x001a	Farallon PN9000SX
-product DEC 21052		0x0021	21052 PCI-PCI
-product DEC 21150		0x0022	21150 PCI-PCI
-product DEC 21150_BC		0x0023	21150-BC PCI-PCI
-product DEC 21152		0x0024	21152 PCI-PCI
-product DEC 21153		0x0025	21153 PCI-PCI
-product DEC 21154		0x0026	21154 PCI-PCI
-product DEC 21554		0x0046	21554 PCI-PCI
+product DEC 21052		0x0021	21052
+product DEC 21150		0x0022	21150
+product DEC 21150_BC		0x0023	21150-BC
+product DEC 21152		0x0024	21152
+product DEC 21153		0x0025	21153
+product DEC 21154		0x0026	21154
+product DEC 21554		0x0046	21554
 product DEC SWXCR		0x1065	SWXCR RAID
 
 /* Dell Computer products */
@@ -2315,7 +2315,7 @@ product	DLINK2 DFE530TXPLUS2	0x8139	DFE-530TX+
 product DPT MEMCTLR		0x1012	Memory Control
 product DPT SC_RAID		0xa400	SmartCache/Raid
 product DPT I960_PPB		0xa500	PCI-PCI
-product DPT RAID_I2O		0xa501	SmartRAID (I2O)
+product DPT RAID_I2O		0xa501	SmartRAID
 product DPT 2005S		0xa511	SmartRAID 2005S
 
 /* Dolphin products */
@@ -2337,9 +2337,9 @@ product EDIMAX RT2860_6		0x7748	RT2860
 product EDIMAX RT2860_7		0x7768	RT2860
 
 /* Efficient Networks products */
-product EFFICIENTNETS ENI155PF	0x0000	155P-MF1 ATM (FPGA)
-product EFFICIENTNETS ENI155PA	0x0002	155P-MF1 ATM (ASIC)
-product EFFICIENTNETS EFSS25	0x0005	25SS-3010 ATM (ASIC)
+product EFFICIENTNETS ENI155PF	0x0000	155P-MF1 ATM
+product EFFICIENTNETS ENI155PA	0x0002	155P-MF1 ATM
+product EFFICIENTNETS EFSS25	0x0005	25SS-3010 ATM
 product EFFICIENTNETS SS1023	0x1023	SpeedStream 1023
 
 /* ELSA products */
@@ -2483,7 +2483,7 @@ product FUSIONIO IOXTREME	0x1006	ioXtreme
 product FUSIONIO IOXTREME_PRO	0x1007	ioXtreme Pro
 
 /* Future Domain products */
-product FUTUREDOMAIN TMC_18C30	0x0000	TMC-18C30 (36C70)
+product FUTUREDOMAIN TMC_18C30	0x0000	TMC-18C30
 
 /* Global Sun Technology products */
 product GLOBALSUN GL24110P03	0x1100	GL24110P03
@@ -2580,9 +2580,9 @@ product HIFN 7956		0x001d	7956
 product HIFN 7955		0x0020	7955/7954
 
 /* Hint products */
-product HINT HB6_1		0x0020	HB6 PCI-PCI
-product HINT HB6_2		0x0021	HB6 PCI-PCI
-product HINT HB4		0x0022	HB4 PCI-PCI
+product HINT HB6_1		0x0020	HB6
+product HINT HB6_2		0x0021	HB6
+product HINT HB4		0x0022	HB4
 product HINT VXPRO_II_HOST	0x8011	Host
 product HINT VXPRO_II_ISA	0x8012	ISA
 product HINT VXPRO_II_EIDE	0x8013	EIDE
@@ -2602,7 +2602,7 @@ product IBM 0x0018		0x0018	Auto LANStreamer
 product IBM GXT150P		0x001b	GXT-150P
 product IBM 82G2675		0x001d	82G2675
 product IBM MCA			0x0020	MCA
-product IBM 82351		0x0022	82351 PCI-PCI
+product IBM 82351		0x0022	82351
 product IBM SERVERAID		0x002e	ServeRAID
 product IBM MIAMI		0x0036	Miami/PCI
 product IBM OLYMPIC		0x003e	Olympic
@@ -2620,7 +2620,7 @@ product ICENSEMBLE ICE1712	0x1712	Envy24 I/O Ctrlr
 product ICENSEMBLE VT172x	0x1724	Envy24PT/HT Audio
 
 /* IDT products */
-product IDT 77201		0x0001	77201/77211 ATM (NICStAR)
+product IDT 77201		0x0001	77201/77211 ATM
 product IDT 89HPES12N3A		0x8018	89HPES12N3A
 product IDT 89HPES24N3A		0x801c	89HPES24N3A
 product IDT 89HPES24T6		0x802e	89HPES24T6
@@ -2632,8 +2632,8 @@ product IDT 89HPES24T3G2	0x806a	89HPES24T3G2
 product INDCOMPSRC WDT50x	0x22c0	WDT 50x Watchdog Timer
 
 /* Initio Corporation */
-product INITIO INIC850		0x0850	INIC-850 (A100UW)
-product INITIO INIC1060		0x1060	INIC-1060 (A100U2W)
+product INITIO INIC850		0x0850	INIC-850
+product INITIO INIC1060		0x1060	INIC-1060
 product INITIO INIC940		0x9400	INIC-940
 product INITIO INIC941		0x9401	INIC-941
 product INITIO INIC950		0x9500	INIC-950
@@ -2746,9 +2746,9 @@ product INTEL WL_130_1		0x0896	WiFi Link 130
 product INTEL WL_130_2		0x0897	WiFi Link 130
 product INTEL WL_100_1		0x08ae	WiFi Link 100
 product INTEL WL_100_2		0x08af	WiFi Link 100
-product INTEL 80960RP		0x0960	i960 RP PCI-PCI
-product INTEL 80960RM		0x0962	i960 RM PCI-PCI
-product INTEL 80960RN		0x0964	i960 RN PCI-PCI
+product INTEL 80960RP		0x0960	i960 RP
+product INTEL 80960RM		0x0962	i960 RM
+product INTEL 80960RN		0x0964	i960 RN
 product INTEL CORE4G_D_ULT_GT1	0x0a02	HD Graphics
 product INTEL CORE4G_M_ULT_GT1	0x0a06	HD Graphics
 product INTEL CORE4G_S_ULT_GT1	0x0a0a	HD Graphics
@@ -2796,32 +2796,32 @@ product INTEL CORE4G_M_CRW_GT3	0x0d26	Iris Pro Graphics 5200
 product INTEL CORE4G_S_CRW_GT3	0x0d2a	HD Graphics
 product INTEL CORE4G_R_CRW_GT3_1 0x0d2b	HD Graphics
 product INTEL CORE4G_R_CRW_GT3_2 0x0d2e	HD Graphics
-product INTEL 82542		0x1000	PRO/1000 (82542)
-product INTEL 82543GC_FIBER	0x1001	PRO/1000F (82543GC)
+product INTEL 82542		0x1000	82542
+product INTEL 82543GC_FIBER	0x1001	82543GC
 product INTEL MODEM56		0x1002	56k Modem
-product INTEL 82543GC_COPPER	0x1004	PRO/1000T (82543GC)
-product INTEL 82544EI_COPPER	0x1008	PRO/1000XT (82544EI)
-product INTEL 82544EI_FIBER	0x1009	PRO/1000XF (82544EI)
-product INTEL 82544GC_COPPER	0x100c	PRO/1000T (82544GC)
-product INTEL 82544GC_LOM	0x100d	PRO/1000XT (82544GC)
-product INTEL 82540EM		0x100e	PRO/1000MT (82540EM)
-product INTEL 82545EM_COPPER	0x100f	PRO/1000MT (82545EM)
-product INTEL 82546EB_COPPER	0x1010	PRO/1000MT (82546EB)
-product INTEL 82545EM_FIBER	0x1011	PRO/1000MF (82545EM)
-product INTEL 82546EB_FIBER	0x1012	PRO/1000MF (82546EB)
-product INTEL 82541EI		0x1013	PRO/1000MT (82541EI)
-product INTEL 82541ER_LOM	0x1014	PRO/1000MT (82541EI)
-product INTEL 82540EM_LOM	0x1015	PRO/1000MT (82540EM)
-product INTEL 82540EP_LOM	0x1016	PRO/1000MT (82540EP)
-product INTEL 82540EP		0x1017	PRO/1000MT (82540EP)
-product INTEL 82541EI_MOBILE	0x1018	PRO/1000MT Mobile (82541EI)
-product INTEL 82547EI		0x1019	PRO/1000CT (82547EI)
-product INTEL 82547EI_MOBILE	0x101a	PRO/1000CT Mobile (82547EI)
-product INTEL 82546EB_QUAD_CPR	0x101d	PRO/1000MT QP (82546EB)
-product INTEL 82540EP_LP	0x101e	PRO/1000MT (82540EP)
-product INTEL 82545GM_COPPER	0x1026	PRO/1000MT (82545GM)
-product INTEL 82545GM_FIBER	0x1027	PRO/1000MF (82545GM)
-product INTEL 82545GM_SERDES	0x1028	PRO/1000MF (82545GM)
+product INTEL 82543GC_COPPER	0x1004	82543GC
+product INTEL 82544EI_COPPER	0x1008	82544EI
+product INTEL 82544EI_FIBER	0x1009	82544EI
+product INTEL 82544GC_COPPER	0x100c	82544GC
+product INTEL 82544GC_LOM	0x100d	82544GC
+product INTEL 82540EM		0x100e	82540EM
+product INTEL 82545EM_COPPER	0x100f	82545EM
+product INTEL 82546EB_COPPER	0x1010	82546EB
+product INTEL 82545EM_FIBER	0x1011	82545EM
+product INTEL 82546EB_FIBER	0x1012	82546EB
+product INTEL 82541EI		0x1013	82541EI
+product INTEL 82541ER_LOM	0x1014	82541EI
+product INTEL 82540EM_LOM	0x1015	82540EM
+product INTEL 82540EP_LOM	0x1016	82540EP
+product INTEL 82540EP		0x1017	82540EP
+product INTEL 82541EI_MOBILE	0x1018	82541EI
+product INTEL 82547EI		0x1019	82547EI
+product INTEL 82547EI_MOBILE	0x101a	82547EI
+product INTEL 82546EB_QUAD_CPR	0x101d	82546EB
+product INTEL 82540EP_LP	0x101e	82540EP
+product INTEL 82545GM_COPPER	0x1026	82545GM
+product INTEL 82545GM_FIBER	0x1027	82545GM
+product INTEL 82545GM_SERDES	0x1028	82545GM
 product INTEL PRO_100		0x1029	PRO/100
 product INTEL 82559		0x1030	82559
 product INTEL PRO_100_VE_0	0x1031	PRO/100 VE
@@ -2840,7 +2840,7 @@ product INTEL PRO_100_VE_3	0x103d	PRO/100 VE
 product INTEL PRO_100_VM_5	0x103e	PRO/100 VM
 product INTEL 536EP		0x1040	V.92 Modem
 product INTEL PRO_WL_2100	0x1043	PRO/Wireless 2100
-product INTEL 82597EX		0x1048	PRO/10GbE (82597EX)
+product INTEL 82597EX		0x1048	82597EX
 product INTEL ICH8_IGP_M_AMT	0x1049	ICH8 IGP M AMT
 product INTEL ICH8_IGP_AMT	0x104a	ICH8 IGP AMT
 product INTEL ICH8_IGP_C	0x104b	ICH8 IGP C
@@ -2856,9 +2856,9 @@ product INTEL PRO_100_VM_10	0x1056	PRO/100 VM
 product INTEL PRO_100_VM_11	0x1057	PRO/100 VM
 product INTEL PRO_100_VM_12	0x1058	PRO/100 VM
 product INTEL PRO_100_M		0x1059	PRO/100 M
-product INTEL 82571EB_COPPER	0x105e	PRO/1000 PT (82571EB)
-product INTEL 82571EB_FIBER	0x105f	PRO/1000 PF (82571EB)
-product INTEL 82571EB_SERDES	0x1060	PRO/1000 PB (82571EB)
+product INTEL 82571EB_COPPER	0x105e	82571EB
+product INTEL 82571EB_FIBER	0x105f	82571EB
+product INTEL 82571EB_SERDES	0x1060	82571EB
 product INTEL 82801FB_LAN_2	0x1064	82801FB LAN
 product INTEL PRO_100_VE_6	0x1065	PRO/100 VE
 product INTEL PRO_100_VM_13	0x1066	PRO/100 VM
@@ -2867,20 +2867,20 @@ product INTEL 82801FBM_LAN	0x1068	82801FBM LAN
 product INTEL 82801GB_LAN_2	0x1069	82801GB LAN
 product INTEL PRO_100_VE_7	0x106a	PRO/100 VE
 product INTEL PRO_100_VE_8	0x106b	PRO/100 VE
-product INTEL 82547GI		0x1075	PRO/1000CT (82547GI)
-product INTEL 82541GI		0x1076	PRO/1000MT (82541GI)
-product INTEL 82541GI_MOBILE	0x1077	PRO/1000MT Mobile (82541GI)
-product INTEL 82541ER		0x1078	PRO/1000MT (82541ER)
-product INTEL 82546GB_COPPER	0x1079	PRO/1000MT (82546GB)
-product INTEL 82546GB_FIBER	0x107a	PRO/1000MF (82546GB)
-product INTEL 82546GB_SERDES	0x107b	PRO/1000MF (82546GB)
-product INTEL 82541GI_LF	0x107c	PRO/1000GT (82541GI)
-product INTEL 82572EI_COPPER	0x107d	PRO/1000 PT (82572EI)
-product INTEL 82572EI_FIBER	0x107e	PRO/1000 PF (82572EI)
-product INTEL 82572EI_SERDES	0x107f	PRO/1000 PB (82572EI)
-product INTEL 82546GB_PCIE	0x108a	PRO/1000MT (82546GB)
-product INTEL 82573E		0x108b	PRO/1000MT (82573E)
-product INTEL 82573E_IAMT	0x108c	PRO/1000MT (82573E)
+product INTEL 82547GI		0x1075	82547GI
+product INTEL 82541GI		0x1076	82541GI
+product INTEL 82541GI_MOBILE	0x1077	82541GI
+product INTEL 82541ER		0x1078	82541ER
+product INTEL 82546GB_COPPER	0x1079	82546GB
+product INTEL 82546GB_FIBER	0x107a	82546GB
+product INTEL 82546GB_SERDES	0x107b	82546GB
+product INTEL 82541GI_LF	0x107c	82541GI
+product INTEL 82572EI_COPPER	0x107d	82572EI
+product INTEL 82572EI_FIBER	0x107e	82572EI
+product INTEL 82572EI_SERDES	0x107f	82572EI
+product INTEL 82546GB_PCIE	0x108a	82546GB
+product INTEL 82573E		0x108b	82573E
+product INTEL 82573E_IAMT	0x108c	82573E
 product INTEL 82573E_IDE	0x108d	82573E IDE
 product INTEL 82573E_KCS	0x108e	82573E KCS
 product INTEL 82573E_SERIAL	0x108f	82573E Serial
@@ -2889,28 +2889,28 @@ product INTEL PRO_100_VM_16	0x1092	PRO/100 VM
 product INTEL PRO_100_VM_17	0x1093	PRO/100 VM
 product INTEL PRO_100_VM_18	0x1094	PRO/100 VM
 product INTEL PRO_100_VM_19	0x1095	PRO/100 VM
-product INTEL 80003ES2LAN_CPR_DPT 0x1096 PRO/1000 PT (80003ES2)
-product INTEL 80003ES2LAN_SDS_DPT 0x1098 PRO/1000 PF (80003ES2)
-product INTEL 82546GB_QUAD_CPR	0x1099	PRO/1000MT QP (82546GB)
-product INTEL 82573L		0x109a	PRO/1000MT (82573L)
-product INTEL 82546GB_2		0x109b	PRO/1000MT (82546GB)
-product INTEL 82597EX_CX4	0x109e	PRO/10GbE CX4 (82597EX)
-product INTEL 82571EB_AT	0x10a0	PRO/1000 AT (82571EB)
-product INTEL 82571EB_AF	0x10a1	PRO/1000 AF (82571EB)
-product INTEL 82571EB_QUAD_CPR	0x10a4	PRO/1000 QP (82571EB)
-product INTEL 82571EB_QUAD_FBR	0x10a5	PRO/1000 QP (82571EB)
-product INTEL 82575EB_COPPER	0x10a7	PRO/1000 PT (82575EB)
-product INTEL 82575EB_SERDES	0x10a9	PRO/1000 PF (82575EB)
-product INTEL 82573L_PL_1	0x10b0	PRO/1000 PL (82573L)
-product INTEL 82573V_PM		0x10b2	PRO/1000 PM (82573V)
-product INTEL 82573E_PM		0x10b3	PRO/1000 PM (82573E)
-product INTEL 82573L_PL_2	0x10b4	PRO/1000 PL (82573L)
-product INTEL 82546GB_QUAD_CPR_K 0x10b5	PRO/1000MT QP (82546GB)
-product INTEL 82598		0x10b6	10GbE (82598)
-product INTEL 82572EI		0x10b9	PRO/1000 PT (82572EI)
-product INTEL 80003ES2LAN_CPR_SPT 0x10ba PRO/1000 PT (80003ES2)
-product INTEL 80003ES2LAN_SDS_SPT 0x10bb PRO/1000 PF (80003ES2)
-product INTEL 82571EB_QUAD_CPR_LP 0x10bc PRO/1000 QP (82571EB)
+product INTEL 80003ES2LAN_CPR_DPT 0x1096 80003ES2
+product INTEL 80003ES2LAN_SDS_DPT 0x1098 80003ES2
+product INTEL 82546GB_QUAD_CPR	0x1099	82546GB
+product INTEL 82573L		0x109a	82573L
+product INTEL 82546GB_2		0x109b	82546GB
+product INTEL 82597EX_CX4	0x109e	82597EX
+product INTEL 82571EB_AT	0x10a0	82571EB
+product INTEL 82571EB_AF	0x10a1	82571EB
+product INTEL 82571EB_QUAD_CPR	0x10a4	82571EB
+product INTEL 82571EB_QUAD_FBR	0x10a5	82571EB
+product INTEL 82575EB_COPPER	0x10a7	82575EB
+product INTEL 82575EB_SERDES	0x10a9	82575EB
+product INTEL 82573L_PL_1	0x10b0	82573L
+product INTEL 82573V_PM		0x10b2	82573V
+product INTEL 82573E_PM		0x10b3	82573E
+product INTEL 82573L_PL_2	0x10b4	82573L
+product INTEL 82546GB_QUAD_CPR_K 0x10b5	82546GB
+product INTEL 82598		0x10b6	82598
+product INTEL 82572EI		0x10b9	82572EI
+product INTEL 80003ES2LAN_CPR_SPT 0x10ba 80003ES2
+product INTEL 80003ES2LAN_SDS_SPT 0x10bb 80003ES2
+product INTEL 82571EB_QUAD_CPR_LP 0x10bc 82571EB
 product INTEL ICH9_IGP_AMT	0x10bd	ICH9 IGP AMT
 product INTEL ICH9_IGP_M	0x10bf	ICH9 IGP M
 product INTEL ICH9_IFE		0x10c0	ICH9 IFE
@@ -2918,45 +2918,45 @@ product INTEL ICH9_IFE_G	0x10c2	ICH9 IFE G
 product INTEL ICH9_IFE_GT	0x10c3	ICH9 IFE GT
 product INTEL ICH8_IFE_GT	0x10c4	ICH8 IFE GT
 product INTEL ICH8_IFE_G	0x10c5	ICH8 IFE G
-product INTEL 82598AF_DUAL	0x10c6	10GbE SR Dual (82598AF)
-product INTEL 82598AF		0x10c7	10GbE SR (82598AF)
-product INTEL 82598AT		0x10c8	10GbE (82598AT)
-product INTEL 82576		0x10c9	PRO/1000 (82576)
+product INTEL 82598AF_DUAL	0x10c6	82598AF
+product INTEL 82598AF		0x10c7	82598AF
+product INTEL 82598AT		0x10c8	82598AT
+product INTEL 82576		0x10c9	82576
 product INTEL ICH9_IGP_M_V	0x10cb	ICH9 IGP M V
 product INTEL ICH10_R_BM_LM	0x10cc	ICH10 R BM LM
 product INTEL ICH10_R_BM_LF	0x10cd	ICH10 R BM LF
 product INTEL ICH10_R_BM_V	0x10ce	ICH10 R BM V
-product INTEL 82574L		0x10d3	PRO/1000 MT (82574L)
-product INTEL 82571PT_QUAD_CPR	0x10d5	PRO/1000 QP (82571PT)
-product INTEL 82575GB_QUAD_CPR	0x10d6	PRO/1000 QP (82575GB)
-product INTEL 82598AT_DUAL	0x10d7	10GbE Dual (82598AT)
-product INTEL 82571EB_SDS_DUAL	0x10d9	PRO/1000 PT (82571EB)
-product INTEL 82571EB_SDS_QUAD	0x10da	PRO/1000 QP (82571EB)
-product INTEL 82598EB_SFP	0x10db	10GbE SFP+ (82598EB)
-product INTEL 82598EB_CX4	0x10dd	10GbE CX4 (82598EB)
+product INTEL 82574L		0x10d3	82574L
+product INTEL 82571PT_QUAD_CPR	0x10d5	82571PT
+product INTEL 82575GB_QUAD_CPR	0x10d6	82575GB
+product INTEL 82598AT_DUAL	0x10d7	82598AT
+product INTEL 82571EB_SDS_DUAL	0x10d9	82571EB
+product INTEL 82571EB_SDS_QUAD	0x10da	82571EB
+product INTEL 82598EB_SFP	0x10db	82598EB
+product INTEL 82598EB_CX4	0x10dd	82598EB
 product INTEL ICH10_D_BM_LM	0x10de	ICH10 D BM LM
 product INTEL ICH10_D_BM_LF	0x10df	ICH10 D BM LF
-product INTEL 82598_SR_DUAL_EM	0x10e1	10GbE SR Dual (82598)
-product INTEL 82575GB_QP_PM	0x10e2	PRO/1000 QP (82575GB)
+product INTEL 82598_SR_DUAL_EM	0x10e1	82598
+product INTEL 82575GB_QP_PM	0x10e2	82575GB
 product INTEL ICH9_BM		0x10e5	ICH9 BM
-product INTEL 82576_FIBER	0x10e6	PRO/1000 FP (82576)
-product INTEL 82576_SERDES	0x10e7	PRO/1000 FP (82576)
-product INTEL 82576_QUAD_COPPER	0x10e8	PRO/1000 QP (82576)
+product INTEL 82576_FIBER	0x10e6	82576
+product INTEL 82576_SERDES	0x10e7	82576
+product INTEL 82576_QUAD_COPPER	0x10e8	82576
 product INTEL 82577LM		0x10ea	82577LM
 product INTEL 82577LC		0x10eb	82577LC
-product INTEL 82598EB_CX4_DUAL	0x10ec	10GbE CX4 Dual (82598EB)
-product INTEL 82599VF		0x10ed	10GbE VF (82599)
+product INTEL 82598EB_CX4_DUAL	0x10ec	82598EB
+product INTEL 82599VF		0x10ed	82599
 product INTEL 82578DM		0x10ef	82578DM
 product INTEL 82578DC		0x10f0	82578DC
-product INTEL 82598_DA_DUAL	0x10f1	10GbE DA Dual (82598)
-product INTEL 82598EB_XF_LR	0x10f4	10GbE LR (82598EB)
+product INTEL 82598_DA_DUAL	0x10f1	82598
+product INTEL 82598EB_XF_LR	0x10f4	82598EB
 product INTEL ICH9_IGP_M_AMT	0x10f5	ICH9 IGP M AMT
 product INTEL 82574LA		0x10f6	82574L
-product INTEL 82599_KX4		0x10f7	10GbE KX4 (82599)
-product INTEL 82599_COMBO_BACKPLANE	0x10f8	10GbE Backplane (82599)
-product INTEL 82599_CX4		0x10f9	10GbE CX4 (82599)
-product INTEL 82599_SFP		0x10fb	10GbE SFP+ (82599)
-product INTEL 82599_XAUI	0x10fc	10GbE XAUI (82599)
+product INTEL 82599_KX4		0x10f7	82599
+product INTEL 82599_COMBO_BP	0x10f8	82599
+product INTEL 82599_CX4		0x10f9	82599
+product INTEL 82599_SFP		0x10fb	82599
+product INTEL 82599_XAUI	0x10fc	82599
 product INTEL 82552		0x10fe	82552
 product INTEL 82815_HB		0x1130	82815 Host
 product INTEL 82815_AGP		0x1131	82815 AGP
@@ -2977,7 +2977,7 @@ product INTEL 82371MX		0x1234	82371 ISA and IDE
 product INTEL 82437MX		0x1235	82437MX
 product INTEL 82441FX		0x1237	82441FX
 product INTEL 82380AB		0x123c	82380AB Mobile ISA
-product INTEL 82380FB		0x124b	82380FB Mobile PCI-PCI
+product INTEL 82380FB		0x124b	82380FB Mobile
 product INTEL 82439HX		0x1250	82439HX
 product INTEL 82806AA		0x1360	82806AA
 product INTEL 82870P2_PPB	0x1460	82870P2 PCIX-PCIX
@@ -2986,31 +2986,31 @@ product INTEL 82870P2_HPLUG	0x1462	82870P2 Hot Plug
 product INTEL ICH8_82567V_3	0x1501	ICH8 82567V-3
 product INTEL 82579LM		0x1502	82579LM
 product INTEL 82579V		0x1503	82579V
-product INTEL 82599_SFP_EM	0x1507	10GbE SFP EM (82599)
-product INTEL 82598_BX		0x1508	10GbE BX (82598)
-product INTEL 82576_NS		0x150a	PRO/1000 (82576NS)
-product INTEL 82598AT2		0x150b	10GbE (82598AT)
-product INTEL 82583V		0x150c	PRO/1000 (82583V)
+product INTEL 82599_SFP_EM	0x1507	82599
+product INTEL 82598_BX		0x1508	82598
+product INTEL 82576_NS		0x150a	82576NS
+product INTEL 82598AT2		0x150b	82598AT
+product INTEL 82583V		0x150c	82583V
 product INTEL 82576_SERDES_QUAD	0x150d	82576 SerDes QP
-product INTEL 82580_COPPER	0x150e	I340-T4 (82580)
-product INTEL 82580_FIBER	0x150f	82580 Fiber
-product INTEL 82580_SERDES	0x1510	82580 SerDes
-product INTEL 82580_SGMII	0x1511	82580 SFP
-product INTEL 82580_COPPER_DUAL	0x1516	I340-T2 (82580)
-product INTEL 82599_KX4_MEZZ	0x1514	10GbE KX4 (82599)
-product INTEL 82599_KR		0x1517	10GbE KR (82599)
-product INTEL 82576_NS_SERDES	0x1518	82576NS SerDes
+product INTEL 82580_COPPER	0x150e	82580
+product INTEL 82580_FIBER	0x150f	82580
+product INTEL 82580_SERDES	0x1510	82580
+product INTEL 82580_SGMII	0x1511	82580
+product INTEL 82580_COPPER_DUAL	0x1516	82580
+product INTEL 82599_KX4_MEZZ	0x1514	82599
+product INTEL 82599_KR		0x1517	82599
+product INTEL 82576_NS_SERDES	0x1518	82576NS
 product INTEL 82599_T3_LOM	0x151c	82599 T3
 product INTEL I350_COPPER	0x1521	I350
 product INTEL I350_FIBER	0x1522	I350 Fiber
 product INTEL I350_SERDES	0x1523	I350 SerDes
 product INTEL I350_SGMII	0x1524	I350 SGMII
-product INTEL 82576_QUAD_CU_ET2	0x1526	PRO/1000 QP (82576)
+product INTEL 82576_QUAD_CU_ET2	0x1526	82576
 product INTEL 82580_QUAD_FIBER	0x1527	82580 QF
 product INTEL X540T		0x1528	X540T
-product INTEL 82599_SFP_FCOE	0x1529	SFP+ FCOE (82599)
-product INTEL 82599_BPLANE_FCOE	0x152a	FCOE (82599)
-product INTEL 82599_SFP_SF2	0x154d	10GbE SFP+ (82599)
+product INTEL 82599_SFP_FCOE	0x1529	82599
+product INTEL 82599_BPLANE_FCOE	0x152a	82599
+product INTEL 82599_SFP_SF2	0x154d	82599
 product INTEL 80960RP_ATU	0x1960	80960RP ATU
 product INTEL 82840_HB		0x1a21	82840 Host
 product INTEL 82840_AGP		0x1a23	82840 AGP
@@ -3019,8 +3019,8 @@ product INTEL 82845_HB		0x1a30	82845 Host
 product INTEL 82845_AGP		0x1a31	82845 AGP
 product INTEL IOAT		0x1a38	I/OAT
 product INTEL 7SERIES_XHCI	0x1e31	7 Series xHCI
-product INTEL 82597EX_SR	0x1a48	PRO/10GbE SR (82597EX)
-product INTEL 82597EX_LR	0x1b48	PRO/10GbE LR (82597EX)
+product INTEL 82597EX_SR	0x1a48	82597EX
+product INTEL 82597EX_LR	0x1b48	82597EX
 product INTEL 6SERIES_SATA_1	0x1c00	6 Series SATA
 product INTEL 6SERIES_SATA_2	0x1c01	6 Series SATA
 product INTEL 6SERIES_AHCI_1	0x1c02	6 Series AHCI
@@ -3815,7 +3815,7 @@ product INTEL EP80579_LPC	0x5031	EP80579 LPC
 product INTEL EP80579_SMBUS	0x5032	EP80579 SMBus
 product INTEL EP80579_UHCI	0x5033	EP80579 USB
 product INTEL EP80579_EHCI	0x5035	EP80579 USB
-product INTEL EP80579_PPB	0x5037	EP80579 PCI-PCI
+product INTEL EP80579_PPB	0x5037	EP80579
 product INTEL EP80579_CAN_1	0x5039	EP80579 CANbus
 product INTEL EP80579_CAN_2	0x503a	EP80579 CANbus
 product INTEL EP80579_SERIAL	0x503b	EP80579 Serial
@@ -3826,7 +3826,7 @@ product INTEL EP80579_RESERVED2	0x503f	EP80579 Reserved
 product INTEL EP80579_LAN_1	0x5040	EP80579 LAN
 product INTEL EP80579_LAN_2	0x5044	EP80579 LAN
 product INTEL EP80579_LAN_3	0x5048	EP80579 LAN
-product INTEL 80960RD		0x5200	i960 RD PCI-PCI
+product INTEL 80960RD		0x5200	i960 RD
 product INTEL PRO_100_SERVER	0x5201	PRO 100 Server
 product INTEL 5100_HB		0x65c0	5100 Host
 product INTEL 5100_PCIE_2	0x65e2	5100 PCIE
@@ -3933,7 +3933,7 @@ product INTEL EG20T_CAN		0x8818	EG20T CAN
 product INTEL EG20T_1588	0x8819	EG20T 1588
 product INTEL 82802AC		0x89ac	82802AC Firmware Hub 8Mbit
 product INTEL 82802AB		0x89ad	82802AB Firmware Hub 4Mbit
-product INTEL I2OPCIB		0x9620	I2O RAID PCI-PCI
+product INTEL I2OPCIB		0x9620	I2O RAID
 product INTEL RCU21		0x9621	RCU21 I2O RAID
 product INTEL RCUxx		0x9622	RCUxx I2O RAID
 product INTEL RCU31		0x9641	RCU31 I2O RAID
@@ -3944,8 +3944,8 @@ product INTEL PINEVIEW_IGC_2	0xa002	Pineview Video
 product INTEL PINEVIEW_M_DMI	0xa010	Pineview DMI
 product INTEL PINEVIEW_M_IGC_1	0xa011	Pineview Video
 product INTEL PINEVIEW_M_IGC_2	0xa012	Pineview Video
-product INTEL 21152		0xb152	S21152BB PCI-PCI
-product INTEL 21154		0xb154	21154AE/BE PCI-PCI
+product INTEL 21152		0xb152	S21152BB
+product INTEL 21154		0xb154	21154AE/BE
 product INTEL CORE_DMI_0	0xd130	Core DMI
 product INTEL CORE_DMI_1	0xd131	Core DMI
 product INTEL CORE_DMI_2	0xd132	Core DMI
@@ -4202,14 +4202,14 @@ product MARVELL2 88SE9125	0x9125	88SE9125 SATA
 product MARVELL2 88SE9172	0x9172	88SE9172 SATA
 
 /* Matrox products */
-product MATROX ATLAS		0x0518	MGA PX2085 (Atlas)
-product MATROX MILLENIUM	0x0519	MGA Millenium 2064W (Storm)
+product MATROX ATLAS		0x0518	MGA PX2085
+product MATROX MILLENIUM	0x0519	MGA Millenium 2064W
 product MATROX MYSTIQUE_220	0x051a	MGA 1064SG 220MHz
 product MATROX MILLENNIUM_II	0x051b	MGA Millennium II 2164W
 product MATROX MILLENNIUM_IIAGP	0x051f	MGA Millennium II 2164WA-B AGP
 product MATROX MILL_II_G200_PCI 0x0520	MGA G200 PCI
 product MATROX MILL_II_G200_AGP 0x0521	MGA G200 AGP
-product MATROX G200E_SE		0x0522	MGA G200e (ServerEngines)
+product MATROX G200E_SE		0x0522	MGA G200e
 product MATROX MILL_II_G400_AGP 0x0525	MGA G400/G450 AGP
 product MATROX G200EW		0x0532	MGA G200eW
 product MATROX IMPRESSION	0x0d10	MGA Impression
@@ -4306,7 +4306,7 @@ product WCH CH352		0x3253	CH352
 
 /* National Datacomm Corp products */
 product NDC NCP130		0x0130	NCP130
-product NDC NCP130A2		0x0131	NCP130 Rev A2
+product NDC NCP130A2		0x0131	NCP130A2
 
 /* National Instruments */
 product NATINST PCIGPIB		0xc801	PCI-GPIB
@@ -4315,9 +4315,9 @@ product NATINST PCIGPIB		0xc801	PCI-GPIB
 product NETCHIP NET2282		0x2282	NET2282 USB
 
 /* NetXen Inc products */
-product NETXEN NXB_10GXxR	0x0001	NXB-10GXxR (NX2031)
-product NETXEN NXB_10GCX4	0x0002	NXB-10GCX4 (NX2031)
-product NETXEN NXB_4GCU		0x0003	NXB-4GCU (NX2035)
+product NETXEN NXB_10GXxR	0x0001	NXB-10GXxR
+product NETXEN NXB_10GCX4	0x0002	NXB-10GCX4
+product NETXEN NXB_4GCU		0x0003	NXB-4GCU
 product NETXEN NXB_IMEZ		0x0004	IMEZ 10GbE
 product NETXEN NXB_HMEZ		0x0005	HMEZ 10GbE
 product NETXEN NXB_IMEZ_2	0x0024	IMEZ 10GbE Mgmt
@@ -4583,7 +4583,7 @@ product NVIDIA MCP04_LAN2	0x0038	MCP04 LAN
 product NVIDIA MCP04_AC97	0x003a	MCP04 AC97
 product NVIDIA MCP04_OHCI	0x003b	MCP04 USB
 product NVIDIA MCP04_EHCI	0x003c	MCP04 USB
-product NVIDIA MCP04_PPB	0x003d	MCP04 PCI-PCI
+product NVIDIA MCP04_PPB	0x003d	MCP04
 product NVIDIA MCP04_SATA2	0x003e	MCP04 SATA
 product NVIDIA NFORCE4_ISA1	0x0050	nForce4 ISA
 product NVIDIA NFORCE4_ISA2	0x0051	nForce4 ISA
@@ -4596,7 +4596,7 @@ product NVIDIA CK804_LAN2	0x0057	CK804 LAN
 product NVIDIA NFORCE4_AC	0x0059	nForce4 AC97
 product NVIDIA NFORCE4_OHCI	0x005a	nForce4 USB
 product NVIDIA NFORCE4_EHCI	0x005b	nForce4 USB
-product NVIDIA NFORCE4_PPB	0x005c	nForce4 PCI-PCI
+product NVIDIA NFORCE4_PPB	0x005c	nForce4
 product NVIDIA NFORCE4_PPB2	0x005d	nForce4 PCIE
 product NVIDIA NFORCE4_MEM	0x005e	nForce4 DDR
 product NVIDIA NFORCE2_ISA	0x0060	nForce2 ISA
@@ -4607,8 +4607,8 @@ product NVIDIA NFORCE2_OHCI	0x0067	nForce2 USB
 product NVIDIA NFORCE2_EHCI	0x0068	nForce2 USB
 product NVIDIA NFORCE2_ACA	0x006a	nForce2 AC97
 product NVIDIA NFORCE2_APU	0x006b	nForce2 Audio
-product NVIDIA NFORCE2_PPB	0x006c	nForce2 PCI-PCI
-product NVIDIA NFORCE2_PPB2	0x006d	nForce2 PCI-PCI
+product NVIDIA NFORCE2_PPB	0x006c	nForce2
+product NVIDIA NFORCE2_PPB2	0x006d	nForce2
 product NVIDIA NFORCE2_FW	0x006e	nForce2 FireWire
 product NVIDIA MCP04_PPB2	0x007e	MCP04 PCIE
 product NVIDIA NFORCE2_400_ISA	0x0080	nForce2 400 ISA
@@ -4618,7 +4618,7 @@ product NVIDIA NFORCE3_LAN2	0x0086	nForce3 LAN
 product NVIDIA NFORCE2_400_OHCI	0x0087	nForce2 400 USB
 product NVIDIA NFORCE2_400_EHCI	0x0088	nForce2 400 USB
 product NVIDIA NFORCE2_400_ACA	0x008a	nForce2 400 AC97
-product NVIDIA NFORCE2_400_PPB	0x008b	nForce2 400 PCI-PCI
+product NVIDIA NFORCE2_400_PPB	0x008b	nForce2 400
 product NVIDIA NFORCE3_LAN3	0x008c	nForce3 LAN
 product NVIDIA NFORCE2_400_SATA	0x008e	nForce2 400 SATA
 product NVIDIA GEFORCE7800GTX	0x0091	GeForce 7800 GTX
@@ -4630,7 +4630,7 @@ product NVIDIA QUADROFXGO1400	0x00cc	Quadro FX Go1400
 product NVIDIA QUADROFX1400	0x00ce	Quadro FX 1400
 product NVIDIA NFORCE3_ISA	0x00d0	nForce3 ISA
 product NVIDIA NFORCE3_PCHB	0x00d1	nForce3 PCI Host
-product NVIDIA NFORCE3_PPB2	0x00d2	nForce3 PCI-PCI
+product NVIDIA NFORCE3_PPB2	0x00d2	nForce3
 product NVIDIA CK804_MEM	0x00d3	CK804
 product NVIDIA NFORCE3_SMB	0x00d4	nForce3 SMBus
 product NVIDIA NFORCE3_IDE	0x00d5	nForce3 IDE
@@ -4639,7 +4639,7 @@ product NVIDIA NFORCE3_OHCI	0x00d7	nForce3 USB
 product NVIDIA NFORCE3_EHCI	0x00d8	nForce3 USB
 product NVIDIA NFORCE3_MODEM	0x00d9	nForce3 Modem
 product NVIDIA NFORCE3_ACA	0x00da	nForce3 AC97
-product NVIDIA NFORCE3_PPB	0x00dd	nForce3 PCI-PCI
+product NVIDIA NFORCE3_PPB	0x00dd	nForce3
 product NVIDIA NFORCE3_LAN4	0x00df	nForce3 LAN
 product NVIDIA NFORCE3_250_ISA	0x00e0	nForce3 250 ISA
 product NVIDIA NFORCE3_250_PCHB	0x00e1	nForce3 250 PCI Host
@@ -4651,7 +4651,7 @@ product NVIDIA NFORCE3_LAN5	0x00e6	nForce3 LAN
 product NVIDIA NFORCE3_250_OHCI	0x00e7	nForce3 250 USB
 product NVIDIA NFORCE3_250_EHCI	0x00e8	nForce3 250 USB
 product NVIDIA NFORCE3_250_ACA	0x00ea	nForce3 250 AC97
-product NVIDIA NFORCE3_250_PPB	0x00ed	nForce3 250 PCI-PCI
+product NVIDIA NFORCE3_250_PPB	0x00ed	nForce3 250
 product NVIDIA NFORCE3_250_SATA2	0x00ee	nForce3 250 SATA
 product NVIDIA GEFORCE6600GTAGP	0x00f1	GeForce 6600 GT AGP
 product NVIDIA GEFORCE6600_3	0x00f2	GeForce 6600
@@ -4709,7 +4709,7 @@ product NVIDIA NFORCE_ACA	0x01b1	nForce AC97
 product NVIDIA NFORCE_ISA	0x01b2	nForce ISA
 product NVIDIA NFORCE_SMB	0x01b4	nForce SMBus
 product NVIDIA NFORCE_AGP	0x01b7	nForce AGP
-product NVIDIA NFORCE_PPB	0x01b8	nForce PCI-PCI
+product NVIDIA NFORCE_PPB	0x01b8	nForce
 product NVIDIA NFORCE_IDE	0x01bc	nForce IDE
 product NVIDIA NFORCE_OHCI	0x01c2	nForce USB
 product NVIDIA NFORCE_LAN	0x01c3	nForce LAN
@@ -4757,7 +4757,7 @@ product NVIDIA MCP51_ACA	0x026b	MCP51 AC97
 product NVIDIA MCP51_HDA	0x026c	MCP51 HD Audio
 product NVIDIA MCP51_OHCI	0x026d	MCP51 USB
 product NVIDIA MCP51_EHCI	0x026e	MCP51 USB
-product NVIDIA MCP51_PPB	0x026f	MCP51 PCI-PCI
+product NVIDIA MCP51_PPB	0x026f	MCP51
 product NVIDIA MCP51_HB		0x0270	MCP51 Host
 product NVIDIA MCP51_PMU	0x0271	MCP51 PMU
 product NVIDIA MCP51_MEM	0x0272	MCP51 Memory
@@ -4823,7 +4823,7 @@ product NVIDIA MCP55_MEM2	0x036a	MCP55 Memory
 product NVIDIA MCP55_OHCI	0x036c	MCP55 USB
 product NVIDIA MCP55_EHCI	0x036d	MCP55 USB
 product NVIDIA MCP55_IDE	0x036e	MCP55 IDE
-product NVIDIA MCP55_PPB_6	0x0370	MCP55 PCI-PCI
+product NVIDIA MCP55_PPB_6	0x0370	MCP55
 product NVIDIA MCP55_HDA	0x0371	MCP55 HD Audio
 product NVIDIA MCP55_LAN1	0x0372	MCP55 LAN
 product NVIDIA MCP55_LAN2	0x0373	MCP55 LAN
@@ -5172,7 +5172,7 @@ product OPTI 82C822		0xc822	82C822
 product OPTI 82C861		0xc861	82C861
 
 /* Option products */
-product OPTION F32		0x000c	3G+ UMTS HSDPA (F32)
+product OPTION F32		0x000c	3G+ UMTS HSDPA
 
 /* Oxford/ VScom */
 product OXFORD VSCOM_PCI010L	0x8001	010L
@@ -5232,9 +5232,9 @@ product RCC CNB20HE_2		0x0008	CNB20HE Host
 product RCC CNB20LE		0x0009	CNB20LE Host
 product RCC CIOB30		0x0010	CIOB30
 product RCC CMIC_HE		0x0011	CMIC-HE
-product RCC CMIC_WS_GC_LE	0x0012	CMIC-WS Host (GC-LE)
+product RCC CMIC_WS_GC_LE	0x0012	CMIC-WS Host
 product RCC CNB20_HE		0x0013	CNB20-HE Host
-product RCC CMIC_LE_GC_LE	0x0014	CNB20-HE Host (GC-LE)
+product RCC CMIC_LE_GC_LE	0x0014	CNB20-HE Host
 product RCC CMIC_GC_1		0x0015	CMIC-GC Host
 product RCC CMIC_GC_2		0x0016	CMIC-GC Host
 product RCC GCNB_LE		0x0017	GCNB-LE Host
@@ -5699,8 +5699,8 @@ product SIS 7300		0x7300	7300 VGA
 product SIS 966_HDA		0x7502	966 HD Audio
 
 /* SMC products */
-product SMC 83C170		0x0005	83C170 (EPIC/100)
-product SMC 83C175		0x0006	83C175 (EPIC/100)
+product SMC 83C170		0x0005	83C170
+product SMC 83C175		0x0006	83C175
 product SMC 37C665		0x1000	FDC 37C665
 product SMC 37C922		0x1001	FDC 37C922
 
@@ -5731,7 +5731,7 @@ product SNI SZB6120		0x6120	SZB6120
 product SONY CXD1947A		0x8009	CXD1947A FireWire
 product SONY CXD3222		0x8039	CXD3222 FireWire
 product SONY MEMSTICK_SLOT	0x808a	Memory Stick Slot
-product SONY RS780		0x9602	RS780 PCI-PCI
+product SONY RS780		0x9602	RS780
 
 /* Stallion Technologies products */
 product STALLION EASYIO		0x0003	EasyIO
@@ -5747,7 +5747,7 @@ product SUN ERINETWORK		0x1101	ERI Ether
 product SUN FIREWIRE		0x1102	FireWire
 product SUN USB			0x1103	USB
 product SUN GEMNETWORK		0x2bad	GEM
-product SUN SIMBA		0x5000	Simba PCI-PCI
+product SUN SIMBA		0x5000	Simba
 product SUN 5821		0x5454	Crypto 5821
 product SUN SCA1K		0x5455	Crypto 1K
 product SUN SCA6K		0x5ca0	Crypto 6K
@@ -5840,14 +5840,14 @@ product TI PCI7420_FW		0x802e	PCI7x20 FireWire
 product TI PCI7XX1		0x8031	PCI7XX1 CardBus
 product TI PCI7XX1_FW		0x8032	PCI7XX1 FireWire
 product TI PCI7XX1_FLASH	0x8033	PCI7XX1 Flash
-product TI PCI7XX1_SD		0x8034	PCI7XX1 Secure Data
+product TI PCI7XX1_SD		0x8034	PCI7XX1 SD
 product TI PCI7XX1_SM		0x8035	PCI7XX1 Smart Card
 product TI PCI6515		0x8036	PCI6515 CardBus
-product TI PCI6515SC		0x8038	PCI6515 CardBus (Smart Card mode)
+product TI PCI6515SC		0x8038	PCI6515 CardBus
 product TI PCIXX12		0x8039	PCIXX12 CardBus
 product TI PCIXX12_FW		0x803a	PCIXX12 FireWire
 product TI PCIXX12_MCR		0x803b	PCIXX12 Multimedia Card Reader
-product TI PCIXX12_SD		0x803c	PCIXX12 Secure Data
+product TI PCIXX12_SD		0x803c	PCIXX12 SD
 product TI PCIXX12_SM		0x803d	PCIXX12 Smart Card
 product TI PCI1620_MISC		0x8201	PCI1620 Misc
 product TI XIO2000A		0x8231	XIO2000A PCIE-PCI
@@ -5871,11 +5871,11 @@ product TI PCI1225		0xac1c	PCI1225 CardBus
 product TI PCI1251		0xac1d	PCI1251 CardBus
 product TI PCI1211		0xac1e	PCI1211 CardBus
 product TI PCI1251B		0xac1f	PCI1251B CardBus
-product TI PCI2030		0xac20	PCI2030 PCI-PCI
-product TI PCI2031		0xac21	PCI2031 PCI-PCI
-product TI PCI2032		0xac22	PCI2032 PCI-PCI
-product TI PCI2250		0xac23	PCI2250 PCI-PCI
-product TI PCI2050		0xac28	PCI2050 PCI-PCI
+product TI PCI2030		0xac20	PCI2030
+product TI PCI2031		0xac21	PCI2031
+product TI PCI2032		0xac22	PCI2032
+product TI PCI2250		0xac23	PCI2250
+product TI PCI2050		0xac28	PCI2050
 product TI PCI4450_CB		0xac40	PCI4450 CardBus
 product TI PCI4410_CB		0xac41	PCI4410 CardBus
 product TI PCI4451_CB		0xac42	PCI4451 CardBus
@@ -5884,9 +5884,9 @@ product TI PCI4520_CB		0xac46	PCI4520 CardBus
 product TI PCI7510_CB		0xac47	PCI7510 CardBus
 product TI PCI7610_CB		0xac48	PCI7610 CardBus
 product TI PCI7410_CB		0xac49	PCI7410 CardBus
-product TI PCI7610SM		0xac4a	PCI7610 CardBus (Smart Card mode)
-product TI PCI7410SD		0xac4b	PCI7[46]10 CardBus (SD/MMC mode)
-product TI PCI7410MS		0xac4c	PCI7[46]10 CardBus (Memory stick mode)
+product TI PCI7610SM		0xac4a	PCI7610 CardBus
+product TI PCI7410SD		0xac4b	PCI7[46]10 CardBus
+product TI PCI7410MS		0xac4c	PCI7[46]10 CardBus
 product TI PCI1410		0xac50	PCI1410 CardBus
 product TI PCI1420		0xac51	PCI1420 CardBus
 product TI PCI1451		0xac52	PCI1451 CardBus
@@ -5907,7 +5907,7 @@ product TOPIC 5634PCV		0x0000	5634PCV SurfRider
 
 /* Toshiba products */
 product TOSHIBA	R4x00		0x0009	R4x00
-product TOSHIBA	TC35856F	0x0020	TC35856F ATM (Meteor)
+product TOSHIBA	TC35856F	0x0020	TC35856F ATM
 product TOSHIBA	R4X00		0x102f	R4x00 PCI
 
 /* Toshiba(2) products */
@@ -5966,10 +5966,10 @@ product TRIONES HPT374		0x0008	HPT374 IDE
 product TRITECH	TR25202		0xfc02	Pyramid3D TR25202
 
 /* Tseng Labs products */
-product TSENG ET4000_W32P_A	0x3202	ET4000w32p rev A
-product TSENG ET4000_W32P_B	0x3205	ET4000w32p rev B
-product TSENG ET4000_W32P_C	0x3206	ET4000w32p rev C
-product TSENG ET4000_W32P_D	0x3207	ET4000w32p rev D
+product TSENG ET4000_W32P_A	0x3202	ET4000w32pA
+product TSENG ET4000_W32P_B	0x3205	ET4000w32pB
+product TSENG ET4000_W32P_C	0x3206	ET4000w32pC
+product TSENG ET4000_W32P_D	0x3207	ET4000w32pD
 product TSENG ET6000		0x3208	ET6000/ET6100
 product TSENG ET6300		0x4702	ET6300
 
@@ -6115,7 +6115,7 @@ product VIATECH VT6202		0x3104	VT6202 USB
 product VIATECH VT6105		0x3106	VT6105 RhineIII
 product VIATECH UNICHROME	0x3108	S3 Unichrome PRO IGP
 product VIATECH VT8361_PCI	0x3112	VT8361 PCI
-product VIATECH VT8101_PPB	0x3113	VT8101 VPX-64 PCI-PCI
+product VIATECH VT8101_PPB	0x3113	VT8101 VPX-64
 product VIATECH VT8375		0x3116	VT8375 PCI
 product VIATECH PM800_UNICHROME	0x3118	PM800 Unichrome S3
 product VIATECH VT612x		0x3119	VT612x
@@ -6139,7 +6139,7 @@ product VIATECH VT8237_ISA	0x3227	VT8237 ISA
 product VIATECH DELTACHROME	0x3230	DeltaChrome Video
 product VIATECH K8T890_3	0x3238	K8T890 Host
 product VIATECH VT6421_SATA	0x3249	VT6421 SATA
-product VIATECH CX700_PPB_1	0x324a	CX700 PCI-PCI
+product VIATECH CX700_PPB_1	0x324a	CX700
 product VIATECH CX700_3		0x324b	CX700 Host
 product VIATECH VX700_1		0x324e	VX700 Host
 product VIATECH VT6655		0x3253	VT6655
@@ -6161,8 +6161,8 @@ product VIATECH VX800_DRAM	0x3353	VX800 DRAM
 product VIATECH P4M900_3	0x3364	P4M900 Host
 product VIATECH CHROME9_HC	0x3371	Chrome9 HC IGP
 product VIATECH VT8237S_ISA	0x3372	VT8237S ISA
-product VIATECH VT8237A_PPB_1	0x337a	VT8237A PCI-PCI
-product VIATECH VT8237A_PPB_2	0x337b	VT8237A PCI-PCI
+product VIATECH VT8237A_PPB_1	0x337a	VT8237A
+product VIATECH VT8237A_PPB_2	0x337b	VT8237A
 product VIATECH K8M800_4	0x4204	K8M800 Host
 product VIATECH K8T890_4	0x4238	K8T890 Host
 product VIATECH PT880_4		0x4258	PT880 Host
@@ -6214,7 +6214,7 @@ product VIATECH VT8231_PWR	0x8235	VT8231 PMG
 product VIATECH VT8363_AGP	0x8305	VT8363 AGP
 product VIATECH CX700_ISA	0x8324	CX700 ISA
 product VIATECH VX800_ISA	0x8353	VX800 ISA
-product VIATECH VT8371_PPB	0x8391	VT8371 PCI-PCI
+product VIATECH VT8371_PPB	0x8391	VT8371
 product VIATECH VX855_ISA	0x8409	VX855 ISA
 product VIATECH VT8501_AGP	0x8501	VT8501 AGP
 product VIATECH VT82C597AGP	0x8597	VT82C597 AGP
@@ -6224,29 +6224,29 @@ product VIATECH VT8605_AGP	0x8605	VT8605 AGP
 product VIATECH VX900_IDE	0x9001	VX900 IDE
 product VIATECH VX800_SDMMC	0x9530	VX800 SD/MMC
 product VIATECH VX800_SDIO	0x95d0	VX800 SDIO
-product VIATECH K8T890_PPB_A	0xa238	K8T890 PCI-PCI
-product VIATECH P4M890_PPB_1	0xa327	P4M890 PCI-PCI
+product VIATECH K8T890_PPB_A	0xa238	K8T890
+product VIATECH P4M890_PPB_1	0xa327	P4M890
 product VIATECH VX800_A		0xa353	VX800 Host
-product VIATECH P4M900_PPB_1	0xa364	P4M900 PCI-PCI
+product VIATECH P4M900_PPB_1	0xa364	P4M900
 product VIATECH VT8633_AGP	0xb091	VT8633 AGP
 product VIATECH VT8366_AGP	0xb099	VT8366 AGP
 product VIATECH VT8361_AGP	0xb112	VT8361 AGP
 product VIATECH VT8101_IOAPIC	0xb113	VT8101 VPX-64 IOAPIC
-product VIATECH VT8363_PCI	0xb115	VT8363 PCI-PCI
+product VIATECH VT8363_PCI	0xb115	VT8363
 product VIATECH VT8235_AGP	0xb168	VT8235 AGP
 product VIATECH K8HTB_AGP	0xb188	K8HTB AGP
 product VIATECH VT8377_AGP	0xb198	VT8377 AGP
-product VIATECH VX800_PPB	0xb353	VX800 PCI-PCI
-product VIATECH K8T890_PPB_B	0xb999	K8T890 PCI-PCI
-product VIATECH K8T890_PPB_C	0xc238	K8T890 PCI-PCI
-product VIATECH P4M890_PPB_2	0xc327	P4M890 PCI-PCI
+product VIATECH VX800_PPB	0xb353	VX800
+product VIATECH K8T890_PPB_B	0xb999	K8T890
+product VIATECH K8T890_PPB_C	0xc238	K8T890
+product VIATECH P4M890_PPB_2	0xc327	P4M890
 product VIATECH VX800_PCIE_0	0xc353	VX800 PCIE
-product VIATECH P4M900_PPB_2	0xc364	P4M900 PCI-PCI
+product VIATECH P4M900_PPB_2	0xc364	P4M900
 product VIATECH VX855_IDE	0xc409	VX855 IDE
-product VIATECH K8T890_PPB_D	0xd238	K8T890 PCI-PCI
-product VIATECH K8T890_PPB_E	0xe238	K8T890 PCI-PCI
+product VIATECH K8T890_PPB_D	0xd238	K8T890
+product VIATECH K8T890_PPB_E	0xe238	K8T890
 product VIATECH VX800_PCIE_1	0xe353	VX800 PCIE
-product VIATECH K8T890_PPB_F	0xf238	K8T890 PCI-PCI
+product VIATECH K8T890_PPB_F	0xf238	K8T890
 product VIATECH VX800_PCIE_2	0xf353	VX800 PCIE
 
 /* Vitesse Semiconductor products */
@@ -6342,10 +6342,10 @@ product VLSI 82C925		0x0280	82C925
 product VMWARE VIRTUAL2		0x0405	Virtual SVGA II
 product VMWARE VIRTUAL		0x0710	Virtual SVGA
 product VMWARE NET		0x0720	Virtual NIC
-product VMWARE MACHINE_2	0x0740	Virtual Machine Communication Interface
+product VMWARE MACHINE_2	0x0740	Virtual Machine Interface
 product VMWARE EHCI		0x0770	Virtual EHCI
 product VMWARE UHCI		0x0774	Virtual UHCI
-product VMWARE PCI		0x0790	Virtual PCI-PCI
+product VMWARE PCI		0x0790	Virtual
 product VMWARE PCIE		0x07a0	Virtual PCIE-PCIE
 product VMWARE NET_3		0x07b0	Virtual VMXNET3
 product VMWARE PVSCSI		0x07c0	Virtual PVSCSI
@@ -6392,7 +6392,7 @@ product XGI VOLARI_V3XT		0x0040	Volari V3XT
 
 /* Xircom products */
 product XIRCOM X3201_3		0x0002	X3201-3
-product XIRCOM X3201_3_21143	0x0003	X3201-3 (21143)
+product XIRCOM X3201_3_21143	0x0003	X3201-3
 product XIRCOM CARDBUS_ETH_1	0x0005	CardBus Ethernet
 product XIRCOM CARDBUS_ETH_2	0x0007	CardBus Ethernet
 product XIRCOM CARDBUS_ETH_3	0x000b	CardBus Ethernet