shorten names a lot

1 files changed, 203 insertions, 203 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 552fc3b2937..b54f0d6d36c 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.696 2003/12/12 22:56:59 deraadt Exp $
+$OpenBSD: pcidevs,v 1.697 2003/12/15 00:40:56 deraadt Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -54,7 +54,7 @@ vendor	COMPAQ		0x0e11	Compaq
 vendor	SYMBIOS		0x1000	Symbios Logic
 vendor	ATI		0x1002	ATI
 vendor	ULSI		0x1003	ULSI Systems
-vendor	VLSI		0x1004	VLSI Technology
+vendor	VLSI		0x1004	VLSI
 vendor	AVANCE		0x1005	Avance Logic
 vendor	NS		0x100b  NS
 vendor	TSENG		0x100c	Tseng Labs
@@ -77,7 +77,7 @@ vendor	FUTUREDOMAIN	0x1036	Future Domain
 vendor	SIS		0x1039	SIS
 vendor	HP		0x103c	Hewlett-Packard
 vendor	PCTECH		0x1042	PC Technology
-vendor	ASUSTEK		0x1043	Asustek Computer
+vendor	ASUSTEK		0x1043	Asustek
 vendor	DPT		0x1044	DPT
 vendor	OPTI		0x1045	Opti
 vendor	ELSA		0x1048	Elsa
@@ -92,7 +92,7 @@ vendor	PROMISE		0x105a	Promise
 vendor	NUMBER9		0x105d	Number 9
 vendor	UMC		0x1060	UMC
 vendor	ITT		0x1061	I. T. T.
-vendor	PICOPOWER	0x1066	Picopower Technology
+vendor	PICOPOWER	0x1066	Picopower
 vendor	MYLEX		0x1069	Mylex
 vendor	APPLE		0x106b	Apple
 vendor	YAMAHA		0x1073	Yamaha
@@ -102,7 +102,7 @@ vendor	CYRIX		0x1078	Cyrix
 vendor	LEADTEK		0x107d	LeadTek Research
 vendor	INTERPHASE	0x107e	Interphase
 vendor	CONTAQ		0x1080	Contaq Microsystems
-vendor	BIT3		0x108a	Bit3 Computer Corp.
+vendor	BIT3		0x108a	Bit3
 vendor	OLICOM		0x108d	Olicom
 vendor	SUN		0x108e	Sun
 vendor	INTERGRAPH	0x1091	Intergraph
@@ -114,13 +114,13 @@ vendor	SGI		0x10a9	Silicon Graphics
 vendor	ACC		0x10aa	ACC Microelectronics
 vendor	SYMPHONY	0x10ad	Symphony Labs
 vendor	STB		0x10b4	STB Systems
-vendor	PLX		0x10b5	PLX Technology
+vendor	PLX		0x10b5	PLX
 vendor	MADGE		0x10b6	Madge Networks
 vendor	3COM		0x10b7	3Com
 vendor	SMC		0x10b8	SMC
 vendor	ALI		0x10b9	Acer Labs
 vendor	MITSUBISHIELEC	0x10ba	Mitsubishi Electronics
-vendor	SURECOM		0x10bd	Surecom Technology
+vendor	SURECOM		0x10bd	Surecom
 vendor	NEOMAGIC	0x10c8	Neomagic
 vendor	MENTOR		0x10cc	Mentor ARC
 vendor	ADVSYS		0x10cd	Advansys
@@ -130,7 +130,7 @@ vendor	ES		0x10dd	Evans & Sutherland
 vendor	NVIDIA		0x10de	Nvidia
 vendor	EMULEX		0x10df	Emulex
 vendor	IMS		0x10e0	Integrated Micro Solutions
-vendor	TEKRAM		0x10e1	Tekram Technology (1st ID)
+vendor	TEKRAM		0x10e1	Tekram (1st ID)
 vendor	NEWBRIDGE	0x10e3	Newbridge
 vendor	AMCIRCUITS	0x10e8	Applied Micro Circuits
 vendor	REALTEK		0x10ec	Realtek
@@ -142,7 +142,7 @@ vendor	SIGMA		0x1105	Sigma Designs
 vendor	VIATECH		0x1106	VIA
 vendor	COGENT		0x1109	Cogent Data Technologies
 vendor	SIEMENS 	0x110a	Siemens AG / Siemens Nixdorf AG
-vendor	ACCTON		0x1113	Accton Technology
+vendor	ACCTON		0x1113	Accton
 vendor	VORTEX		0x1119	Vortex
 vendor	EFFICIENTNETS	0x111a	Efficent Networks
 vendor	IDT		0x111d	IDT
@@ -213,7 +213,7 @@ vendor	LAVA		0x1407	Lava
 vendor	SUNIX		0x1409	Sunix
 vendor	OXFORD2		0x1415	Oxford
 vendor	TAMARACK	0x143d	Tamarack Microelectronics
-vendor	ASKEY		0x144f	Askey Computer Corp.
+vendor	ASKEY		0x144f	Askey
 vendor	AVERMEDIA	0x1461	Avermedia Technologies
 vendor	OXFORD		0x14d2	Oxford
 vendor	AIRONET		0x14b9	Aironet
@@ -223,7 +223,7 @@ vendor	CONEXANT	0x14f1	Conexant
 vendor	DELTA		0x1500	Delta
 vendor	MYSON		0x1516	Myson Century
 vendor	TOPIC		0x151f	Topic/SmartLink
-vendor	ENE		0x1524	ENE Technology
+vendor	ENE		0x1524	ENE
 vendor	TERRATEC	0x153b	TerraTec Electronic Gmbh
 vendor	SYMBOL		0x1562	Symbol
 vendor	SYBA		0x1592	Syba
@@ -241,7 +241,7 @@ vendor	ANTARES		0x1754	Antares Microsystems
 vendor	CAVIUM		0x177d	Cavium
 vendor	LANERGY		0x1812	Lanergy
 vendor	SYMPHONY2	0x1c1c	Symphony Labs
-vendor	TEKRAM2		0x1de1	Tekram Technology
+vendor	TEKRAM2		0x1de1	Tekram
 vendor	HINT		0x3388	Hint
 vendor	3DLABS		0x3d3d	3D Labs
 vendor	AVANCE2		0x4005	Avance Logic
@@ -268,12 +268,12 @@ vendor	INVALID		0xffff	INVALID VENDOR ID
  */
 
 /* O2 Micro */
-product O2MICRO OZ6832		0x6832	OZ6832 and OZ6836 CardBus
-product O2MICRO OZ6836		0x6836	OZ6836 and OZ6860 CardBus
-product O2MICRO OZ6872		0x6872	OZ6812 and OZ6872 CardBus
+product O2MICRO OZ6832		0x6832	OZ6832 CardBus
+product O2MICRO OZ6836		0x6836	OZ6836/OZ6860 CardBus
+product O2MICRO OZ6872		0x6872	OZ68[17]2 CardBus
 product O2MICRO OZ6922		0x6925	OZ6922 CardBus
 product O2MICRO OZ6933		0x6933	OZ6933 CardBus
-product O2MICRO OZ6972		0x6972	OZ6912 and OZ6972 CardBus
+product O2MICRO OZ6972		0x6972	OZ69[17]2 CardBus
 
 /* 3Com Products */
 product 3COM 3C985		0x0001	3c985
@@ -342,8 +342,8 @@ product TRIWARE ESCALADE	0x1000	Escalade IDE RAID
 product TRIWARE ESCALADE_ASIC	0x1001	Escalade IDE RAID
 
 /* Aironet Products */
-product AIRONET PC4800_1	0x0001	Cisco PC4800 Wireless
-product AIRONET PCI352		0x0350	Cisco/Aironet PCI35x WLAN
+product AIRONET PC4800_1	0x0001	PC4800 Wireless
+product AIRONET PCI352		0x0350	PCI35x WLAN
 product AIRONET PC4500		0x4500	PC4500 Wireless
 product AIRONET PC4800		0x4800	PC4800 Wireless
 product AIRONET MPI350		0xa504	MPI-350 Wireless
@@ -354,17 +354,17 @@ product ACC 2051_HB		0x2051	2051 Host-PCI
 product ACC 2051_ISA		0x5842	2051 Host-ISA
 
 /* Acard products */
-product ACARD ATP850U		0x0005	ATP850U/UF IDE
-product ACARD ATP860		0x0006	ATP860 IDE
-product ACARD ATP860A		0x0007	ATP860-A IDE
-product ACARD ATP865A		0x0008	ATP865-A IDE
-product ACARD ATP865R		0x0009	ATP865-R IDE
-product ACARD AEC6710		0x8002	AEC6710 SCSI
-product ACARD AEC6712UW		0x8010	AEC6712UW SCSI
-product ACARD AEC6712U		0x8020	AEC6712U SCSI
-product ACARD AEC6712S		0x8030	AEC6712S SCSI
-product ACARD AEC6710D		0x8040	AEC6710D SCSI
-product ACARD AEC6715UW		0x8050	AEC6715UW SCSI
+product ACARD ATP850U		0x0005	ATP850U/UF
+product ACARD ATP860		0x0006	ATP860
+product ACARD ATP860A		0x0007	ATP860-A
+product ACARD ATP865A		0x0008	ATP865-A
+product ACARD ATP865R		0x0009	ATP865-R
+product ACARD AEC6710		0x8002	AEC6710
+product ACARD AEC6712UW		0x8010	AEC6712UW
+product ACARD AEC6712U		0x8020	AEC6712U
+product ACARD AEC6712S		0x8030	AEC6712S
+product ACARD AEC6710D		0x8040	AEC6710D
+product ACARD AEC6715UW		0x8050	AEC6715UW
 
 /* Accton products */
 product ACCTON 5030		0x1211	MPX 5030/5038
@@ -380,16 +380,16 @@ product ACER M1435		0x1435	M1435 VL-PCI
 
 /* Acer Labs products */
 product ALI M1445		0x1445	M1445 VL-PCI
-product ALI M1449		0x1449	M1449 PCI-ISA
+product ALI M1449		0x1449	M1449 ISA
 product ALI M1451		0x1451	M1451 Host-PCI
 product ALI M1461		0x1461	M1461 Host-PCI
 product ALI M1489		0x1489	M1489 Host-PCI
 product ALI M1521		0x1521	M1523 Host-PCI
-product ALI M1523		0x1523	M1523 PCI-ISA
+product ALI M1523		0x1523	M1523 ISA
 product ALI M1531		0x1531	M1531 Host-PCI
-product ALI M1533		0x1533	M1533 PCI-ISA
+product ALI M1533		0x1533	M1533 ISA
 product ALI M1535		0x1535	M1535 PCI
-product ALI M1543		0x1543	M1543 PCI-ISA
+product ALI M1543		0x1543	M1543 ISA
 product ALI M1541		0x1541	M1541 Host-PCI
 product ALI M1621		0x1621	M1621 Host-PCI
 product ALI M1647		0x1647	M1647 PCI
@@ -489,34 +489,34 @@ product AMD AMD64_HT		0x1100	AMD64 HyperTransport
 product AMD AMD64_ADDR		0x1101	AMD64 Address Map
 product AMD AMD64_DRAM		0x1102	AMD64 DRAM Cfg
 product AMD AMD64_MISC		0x1103	AMD64 Misc Cfg
-product AMD PCNET_PCI		0x2000	79c970 PCnet-PCI LANCE
-product AMD PCHOME_PCI		0x2001	79c978 PChome-PCI LANCE
-product AMD PCSCSI_PCI		0x2020	53c974 PCscsi-PCI SCSI
-product AMD PCNETS_PCI		0x2040	79C974 PCnet-PCI Ether+SCSI
+product AMD PCNET_PCI		0x2000	79c970 PCnet-PCI
+product AMD PCHOME_PCI		0x2001	79c978 PChome-PCI
+product AMD PCSCSI_PCI		0x2020	53c974 PCscsi-PCI
+product AMD PCNETS_PCI		0x2040	79C974 PCnet-PCI
 product AMD ELANSC520		0x3000	ElanSC520 Host-PCI
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/21910.pdf */
-product AMD SC751_SC		0x7006	751 System Controller
+product AMD SC751_SC		0x7006	751 System
 product AMD SC751_PPB		0x7007	751 PCI-PCI
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/24462.pdf */
 product AMD 762_PCHB		0x700c	762 Host-PCI
 product AMD 762_PPB		0x700d	762 PCI-PCI
 product AMD 761_PCHB		0x700e	761 Host-PCI
 product AMD 761_PPB		0x700f	761 PCI-PCI
-product AMD 755_ISA		0x7400	755 PCI-ISA
+product AMD 755_ISA		0x7400	755 ISA
 product AMD 755_IDE		0x7401	755 IDE
 product AMD 755_PMC		0x7403	755 Power Mgmt
 product AMD 755_USB		0x7404	755 USB
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/22548.pdf */
-product AMD PBC756_ISA		0x7408	756 PCI-ISA
+product AMD PBC756_ISA		0x7408	756 ISA
 product AMD PBC756_IDE		0x7409	756 IDE
 product AMD PBC756_PMC		0x740b	756 Power Mgmt
 product AMD PBC756_USB		0x740c	756 USB Host
-product AMD 766_ISA		0x7410	766 PCI-ISA
+product AMD 766_ISA		0x7410	766 ISA
 product AMD 766_IDE		0x7411	766 IDE
 product AMD 766_USB		0x7412	766 USB
 product AMD 766_PMC		0x7413	766 Power Mgmt
 product AMD 766_USB_HCI		0x7414	766 USB OpenHCI
-product AMD PBC768_ISA		0x7440	768 PCI-ISA
+product AMD PBC768_ISA		0x7440	768 ISA
 product AMD PBC768_IDE		0x7441	768 IDE
 product AMD PBC768_PMC		0x7443	768 Power Mgmt
 product AMD PBC768_ACA		0x7445	768 AC97 Audio
@@ -559,16 +559,16 @@ product APPLE PANGEA_OHCI	0x0026	Pangea USB
 product APPLE PANGEA_AGP	0x0027	Pangea AGP
 product APPLE PANGEA_PCI1	0x0028	Pangea Host-PCI
 product APPLE PANGEA_PCI2	0x0029	Pangea Host-PCI
-product APPLE UNINORTH2AGP	0x002d  Uni-N2 AGP
-product APPLE UNINORTH2		0x002e  Uni-N2 Host
-product APPLE UNINORTH2ETH	0x002f  Uni-N2 Host
+product APPLE UNINORTH2AGP	0x002d	Uni-N2 AGP
+product APPLE UNINORTH2		0x002e	Uni-N2 Host
+product APPLE UNINORTH2ETH	0x002f	Uni-N2 Host
 product APPLE PANGEA_FW		0x0030	Pangea FireWire
-product APPLE UNINORTH_FW       0x0031  UniNorth Firewire
-product APPLE GMAC3             0x0032  GMAC Ethernet
+product APPLE UNINORTH_FW	0x0031	UniNorth Firewire
+product APPLE GMAC3		0x0032	GMAC Ethernet
 product APPLE UNINORTH_ATA	0x0033	Uni-N ATA
-product APPLE UNINORTH_AGP3     0x0034  UniNorth AGP Bridge
-product APPLE UNINORTH5         0x0035  UniNorth Host-PCI Bridge
-product APPLE UNINORTH6         0x0036  UniNorth Host-PCI Bridge
+product APPLE UNINORTH_AGP3	0x0034	UniNorth AGP
+product APPLE UNINORTH5		0x0035	UniNorth Host-PCI
+product APPLE UNINORTH6		0x0036	UniNorth Host-PCI
 product APPLE INTREPID_ATA	0x003b	Intrepid ATA
 product APPLE INTREPID		0x003e	Intrepid
 product APPLE INTREPID_OHCI	0x003f	Intrepid USB
@@ -685,14 +685,14 @@ product AVANCE2 ALG2302		0x2302	ALG2302
 product AVANCE2 ALS4000		0x4000	ALS4000
 
 /* AVM products */
-product AVM FRITZ_CARD		0x0a00  Fritz ISDN
-product AVM FRITZ_PCI_V2_ISDN	0x0e00  Fritz v2.0 ISDN
-product AVM B1			0x0700  BRI ISDN
-product AVM T1			0x1200  PRI T1 ISDN
+product AVM FRITZ_CARD		0x0a00	Fritz ISDN
+product AVM FRITZ_PCI_V2_ISDN	0x0e00	Fritz v2.0 ISDN
+product AVM B1			0x0700	BRI ISDN
+product AVM T1			0x1200	PRI T1 ISDN
 
 /* Bit3 products */
-product BIT3 PCIVME617		0x0001	PCI-VME 617
-product BIT3 PCIVME2706		0x0300	PCI-VME 2706
+product BIT3 PCIVME617		0x0001	VME 617
+product BIT3 PCIVME2706		0x0300	VME 2706
 
 /* Bluesteel Networks */
 product BLUESTEEL 5501		0x0000	5501
@@ -730,7 +730,7 @@ product BROOKTREE BT878		0x036e	BT878
 product BROOKTREE BT879		0x036f	BT879
 product BROOKTREE BT878_AU	0x0878	BT878 Audio
 product BROOKTREE BT879_AU	0x0879	BT879 Audio
-product BROOKTREE BT8474	0x8474	Bt8474 Multichannel HDLC Controller
+product BROOKTREE BT8474	0x8474	Bt8474 HDLC
 
 /* BusLogic products */
 product BUSLOGIC MULTIMASTER_NC	0x0140	MultiMaster NC
@@ -769,8 +769,8 @@ product CIRRUS CL_GD5462	0x00d0	CL-GD5462
 product CIRRUS CL_GD5464	0x00d4	CL-GD5464
 product CIRRUS CL_GD5465	0x00d6	CL-GD5465
 product CIRRUS CL_PD6729	0x1100	CL-PD6729
-product CIRRUS CL_PD6832	0x1110	CL-PD6832 PCI-CardBus
-product CIRRUS CL_PD6833	0x1113	CL-PD6833 PCI-CardBus
+product CIRRUS CL_PD6832	0x1110	CL-PD6832 CardBus
+product CIRRUS CL_PD6833	0x1113	CL-PD6833 CardBus
 product CIRRUS CL_GD7542	0x1200	CL-GD7542
 product CIRRUS CL_GD7543	0x1202	CL-GD7543
 product CIRRUS CL_GD7541	0x1204	CL-GD7541
@@ -800,8 +800,8 @@ product CMDTECH 3112		0x3112	SiI3112 SATA
 product COGENT EM110TX		0x1400 EX110TX
 
 /* Compaq products */
-product COMPAQ PCI_EISA_BRIDGE	0x0001	PCI-EISA
-product COMPAQ PCI_ISA_BRIDGE	0x0002	PCI-ISA
+product COMPAQ PCI_EISA_BRIDGE	0x0001	EISA
+product COMPAQ PCI_ISA_BRIDGE	0x0002	ISA
 product COMPAQ TRIFLEX1		0x1000	Triflex Host-PCI
 product COMPAQ TRIFLEX2		0x2000	Triflex Host-PCI
 product COMPAQ QVISION_V0	0x3032	QVision
@@ -818,19 +818,19 @@ product COMPAQ CSA6400		0x409C	Smart Array 6400
 product COMPAQ CSA6400EM	0x409D	Smart Array 6400 EM
 product COMPAQ USB		0x7020	USB
 product COMPAQ FXP		0xa0f0	Netelligent ASMC
-product COMPAQ PCI_ISA_BRIDGE1	0xa0f3	PCI-ISA
-product COMPAQ PCI_HOTPLUG	0xa0f7	PCI Hotplug controller
+product COMPAQ PCI_ISA_BRIDGE1	0xa0f3	ISA
+product COMPAQ PCI_HOTPLUG	0xa0f7	PCI Hotplug
 product COMPAQ OHCI		0xa0f8	USB OpenHost
 product COMPAQ SMART2P		0xae10	SMART2P RAID
-product COMPAQ PCI_ISA_BRIDGE3	0xae29	PCI-ISA
-product COMPAQ PCI_ISAPNP	0xae2b	PCI-ISAPnP
+product COMPAQ PCI_ISA_BRIDGE3	0xae29	ISA
+product COMPAQ PCI_ISAPNP	0xae2b	ISAPnP
 product COMPAQ N100TX		0xae32	Netelligent 10/100 TX
 product COMPAQ IDE		0xae33	Netelligent IDE
 product COMPAQ N10T		0xae34	Netelligent 10 T
 product COMPAQ IntNF3P		0xae35	Integrated NetFlex 3/P
 product COMPAQ DPNet100TX	0xae40	Dual Port Netelligent 10/100 TX
 product COMPAQ IntPL100TX	0xae43	ProLiant Netelligent 10/100 TX
-product COMPAQ PCI_ISA_BRIDGE2	0xae69	PCI-ISA
+product COMPAQ PCI_ISA_BRIDGE2	0xae69	ISA
 product COMPAQ HOST_PCI_BRIDGE1	0xae6c	Host-PCI
 product COMPAQ HOST_PCI_BRIDGE2 0xae6d	Host-PCI
 product COMPAQ DP4000		0xb011	Embedded Netelligent 10/100 TX
@@ -849,14 +849,14 @@ product COMPEX 98713		0x9881	PMAC 98713
 /* Conexant products */
 product CONEXANT 56K_WINMODEM	0x1033	56k Winmodem
 product CONEXANT 56K_WINMODEM2	0x1036	56k Winmodem
-product CONEXANT RS7112		0x1803	10/100 MiniPCI Ethernet
-product CONEXANT 56K_WINMODEM3	0x1804	10/100 MiniPCI Ethernet
+product CONEXANT RS7112		0x1803	10/100
+product CONEXANT 56K_WINMODEM3	0x1804	10/100
 product CONEXANT SOFTK56_PCI	0x2443	SoftK56 PCI
 product CONEXANT HSF_56K_HSFI	0x2f00	HSF 56k HSFi
 
 /* Contaq Microsystems products */
-product CONTAQ 82C599		0x0600	82C599 PCI-VLB
-product CONTAQ 82C693		0xc693	CY82C693U PCI-ISA
+product CONTAQ 82C599		0x0600	82C599 VLB
+product CONTAQ 82C693		0xc693	CY82C693U ISA
 
 /* Corollary Products */
 product COROLLARY CBUSII_PCIB	0x0014	C-Bus II-PCI
@@ -880,12 +880,12 @@ product CYCLADES CYCLOMZ_1	0x0200	Cyclom-Z below 1M
 product CYCLADES CYCLOMZ_2	0x0201	Cyclom-Z
 
 /* Cyclone Microsystems products */
-product CYCLONE PCI_700		0x0700	IQ80310 (PCI-700)
+product CYCLONE PCI_700		0x0700	IQ80310
 
 /* Cyrix/National Semiconductor products */
 product CYRIX GXMPCI		0x0001	GXm Host-PCI
-product CYRIX GXMISA		0x0002	GXm PCI-ISA
-product CYRIX CX5530_PCIB	0x0100	Cx5530 South Bridge
+product CYRIX GXMISA		0x0002	GXm ISA
+product CYRIX CX5530_PCIB	0x0100	Cx5530 South
 product CYRIX CX5530_SMI	0x0101	Cx5530 SMI/ACPI
 product CYRIX CX5530_IDE	0x0102	Cx5530 IDE
 product CYRIX CX5530_AUDIO	0x0103	Cx5530 XpressAUDIO
@@ -950,16 +950,16 @@ product DLINK DGE550T		0x4000	DGE-550T
 
 /* Distributed Processing Technology products */
 product DPT SC_RAID		0xa400	SmartCache/Raid
-product DPT I960_PPB		0xa500	PCI-PCI bridge
+product DPT I960_PPB		0xa500	PCI-PCI
 product DPT RAID_I2O		0xa501	SmartRAID (I2O)
 product DPT 2005S		0xa511	SmartRAID 2005S
-product DPT MEMCTLR		0x1012	Memory Controller
+product DPT MEMCTLR		0x1012	Memory Control
 
 /* Dolphin products */
 product DOLPHIN PCISCI		0x0658	PCI-SCI
 
 /* DTC Technology Corp products */
-product DTCTECH DMX3194U	0x0002	DMX3194U SCSI
+product DTCTECH DMX3194U	0x0002	DMX3194U
 
 /* Dynalink products */
 product DYNALINK IS64PH		0x1702	IS64PH ISDN
@@ -985,7 +985,7 @@ product ENDACE DAG423		0x4230	Endace Dag4.23
 product ENDACE DAG423GE		0x423e	Endace Dag4.23GE
 
 /* ENE Technology products */
-product ENE CB1410		0x1410	CB-1410 PCI-CardBus
+product ENE CB1410		0x1410	CB-1410 CardBus
 
 /* Ensoniq products */
 product ENSONIQ	AUDIOPCI97	0x1371	AudioPCI97
@@ -1011,7 +1011,7 @@ product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI
 product ESSENTIAL RR_GIGE	0x0005	RoadRunner Gig-E
 
 /* Evans & Sutherland products */
-product ES FREEDOM		0x0001	Freedom PCI-GBus
+product ES FREEDOM		0x0001	Freedom GBus
 
 /* Eumitcom Technology products */
 product EUMITCOM WL11000P	0x1100	WL11000P
@@ -1072,7 +1072,7 @@ product IBM 0x0007 		0x0007	CPU - Alta MP
 product IBM 0x000a 		0x000a	ISA w/PnP
 product IBM 0x0017 		0x0017	CPU
 product IBM 0x0018 		0x0018	Auto LANStreamer
-product IBM GXT150P		0x001b	GXT-150P 2D Accelerator
+product IBM GXT150P		0x001b	GXT-150P
 product IBM 82G2675		0x001d	82G2675
 product IBM 0x0020		0x0020	MCA
 product IBM 82351		0x0022	82351 PCI-PCI
@@ -1081,7 +1081,7 @@ product IBM 0x0036		0x0036	Miami/PCI
 product IBM OLYMPIC		0x003e	Olympic
 product IBM I82557B		0x0057	i82557B 10/100
 product IBM FIREGL2		0x0170	FireGL2
-product IBM PCIX		0x01a7	PCI-X to PCI-X
+product IBM PCIX		0x01a7	PCIX-PCIX
 
 /* IDT products */
 product IDT 77201		0x0001	77201/77211 ATM (NICStAR)
@@ -1090,11 +1090,11 @@ product IDT 77201		0x0001	77201/77211 ATM (NICStAR)
 product INDCOMPSRC WDT50x	0x22c0	WDT 50x Watchdog Timer
 
 /* Initio Corporation */
-product INITIO INIC850		0x0850	INIC-850 (A100UW) SCSI
-product INITIO INIC1060		0x1060	INIC-1060 (A100U2W) SCSI
-product INITIO INIC940		0x9400	INIC-940 SCSI
-product INITIO INIC941		0x9401	INIC-941 SCSI
-product INITIO INIC950		0x9500	INIC-950 SCSI
+product INITIO INIC850		0x0850	INIC-850 (A100UW)
+product INITIO INIC1060		0x1060	INIC-1060 (A100U2W)
+product INITIO INIC940		0x9400	INIC-940
+product INITIO INIC941		0x9401	INIC-941
+product INITIO INIC950		0x9500	INIC-950
 
 /* Integrated Micro Solutions products */
 product IMS 8849		0x8849	8849
@@ -1102,11 +1102,11 @@ product IMS 8849		0x8849	8849
 /* Intel products */
 product INTEL 21145		0x0039	21145
 product INTEL EESISA		0x0008	EES ISA
-product INTEL 80312		0x030d	80312 I/O Companion Chip
-product INTEL PCEB		0x0482	82375EB PCI-EISA
+product INTEL 80312		0x030d	80312 I/O Companion
+product INTEL PCEB		0x0482	82375EB EISA
 product INTEL CDC		0x0483	82424ZX Cache/DRAM
-product INTEL SIO		0x0484	82378IB PCI-ISA
-product INTEL 82426EX		0x0486	82426EX PCI-to-ISA
+product INTEL SIO		0x0484	82378IB ISA
+product INTEL 82426EX		0x0486	82426EX ISA
 product INTEL PCMC		0x04a3	82434LX/NX PCI/Cache/DRAM
 product INTEL GDT_RAID1		0x0600	GDT RAID
 product INTEL GDT_RAID2		0x061f	GDT RAID
@@ -1181,18 +1181,18 @@ product INTEL EEPRO100		0x1227	EE Pro 100
 product INTEL EEPRO100S		0x1228	EE Pro 100 Smart
 product INTEL 82557		0x1229	82557
 product INTEL 82437FX		0x122d	82437FX
-product INTEL 82371FB_ISA	0x122e	82371FB PCI-ISA
+product INTEL 82371FB_ISA	0x122e	82371FB ISA
 product INTEL 82371FB_IDE	0x1230	82371FB IDE
-product INTEL 82371MX		0x1234	82371 PCI-ISA and IDE
+product INTEL 82371MX		0x1234	82371 ISA and IDE
 product INTEL 82437MX		0x1235	82437 PCI/Cache/DRAM
 product INTEL 82441FX		0x1237	82441FX
-product INTEL 82380AB		0x123c	82380AB Mobile PCI-ISA
+product INTEL 82380AB		0x123c	82380AB Mobile ISA
 product INTEL 82380FB		0x124b	82380FB Mobile PCI-PCI
 product INTEL 82439HX		0x1250	82439HX
 product INTEL 82806AA		0x1360	82806AA PCI64
 product INTEL 82870P2_PPB	0x1460	82870P2 P64H2 PCI-PCI
 product INTEL 82870P2_IOxAPIC	0x1461	P64H2 IOxAPIC
-product INTEL 82870P2_HPLUG	0x1462	P64H2 Hot Plug Controller
+product INTEL 82870P2_HPLUG	0x1462	P64H2 Hot Plug
 product INTEL 80960RP_ATU	0x1960	80960RP ATU
 product INTEL 82840_HB		0x1a21	82840 Host
 product INTEL 82840_AGP		0x1a23	82840 AGP
@@ -1276,27 +1276,27 @@ product INTEL 82860_PCI4	0x2536	82860 PCI-PCI
 product INTEL 82845G		0x2560	82845G/GL
 product INTEL 82845G_AGP	0x2561	82845G/GL/GV/GE/PE Host-AGP
 product INTEL 82845G_IGD	0x2562	82845G/GL Video
-product INTEL 82865_IO_1	0x2570	82865G/PE/P CPU to I/0 Bridge 1
-product INTEL 82865_AGP		0x2571	82865G/PE/P CPU to AGP Bridge
-product INTEL 82865_CSA		0x2573	82865G/PE/P CPU to CSA Bridge
-product INTEL 82865_IO_2	0x2576	82865G/PE/P CPU to I/0 Bridge 2
+product INTEL 82865_IO_1	0x2570	82865G/PE/P CPU-I/0-1
+product INTEL 82865_AGP		0x2571	82865G/PE/P CPU-AGP
+product INTEL 82865_CSA		0x2573	82865G/PE/P CPU-CSA
+product INTEL 82865_IO_2	0x2576	82865G/PE/P CPU-I/0-2
 product INTEL 82875P_HB		0x2578	82875P Host
-product INTEL 82875P_AGP	0x2579	82875P PCI-AGP
+product INTEL 82875P_AGP	0x2579	82875P AGP
 product INTEL 82875P_CSA	0x257b	82875P PCI-CSA
 product INTEL 31244		0x3200	31244 SATA
-product INTEL 82830MP_IO_1	0x3575	82830MP CPU to I/O Bridge 1
-product INTEL 82830MP_AGP	0x3576	82830MP CPU to AGP Bridge
+product INTEL 82830MP_IO_1	0x3575	82830MP CPU-I/O-1
+product INTEL 82830MP_AGP	0x3576	82830MP CPU-AGP
 product INTEL 82830MP_IV	0x3577	82830MP Integrated Video
-product INTEL 82830MP_IO_2	0x3578	82830MP CPU to I/O Bridge 2
-product INTEL 82852GM_HPB	0x3580	82852GM Hub-to-PCI
+product INTEL 82830MP_IO_2	0x3578	82830MP CPU-I/O-2
+product INTEL 82852GM_HPB	0x3580	82852GM Hub-PCI
 product INTEL 82852GM_AGP	0x3582	82852GM AGP
 product INTEL 82852GM_MEM	0x3584	82852GM Memory
 product INTEL 82852GM_CFG	0x3585	82852GM Configuration
-product INTEL 82855PE		0x3340	82855PE Host-Hub Bridge
+product INTEL 82855PE		0x3340	82855PE Host-Hub
 product INTEL 82855PE_AGP	0x3341	82855PE AGP
 product INTEL 82801DBM		0x24cc	82801DBM LPC
 product INTEL RCU32		0x3092	RCU32 I2O RAID
-product INTEL 82371SB_ISA	0x7000	82371SB PCI-ISA
+product INTEL 82371SB_ISA	0x7000	82371SB ISA
 product INTEL 82371SB_IDE	0x7010	82371SB IDE
 product INTEL 82371USB		0x7020	82371SB USB
 product INTEL 82437VX		0x7030	82437VX
@@ -1311,19 +1311,19 @@ product INTEL 82810_DC100_MCH	0x7122	82810-DC100
 product INTEL 82810_DC100_GC	0x7123	82810-DC100 Graphics
 product INTEL 82810E_MCH	0x7124	82810E
 product INTEL 82810E_GC		0x7125	82810E Graphics
-product INTEL 82443LX		0x7180	82443LX PCI-AGP
+product INTEL 82443LX		0x7180	82443LX AGP
 product INTEL 82443LX_AGP	0x7181	82443LX AGP
-product INTEL 82443BX		0x7190	82443BX PCI-AGP
+product INTEL 82443BX		0x7190	82443BX AGP
 product INTEL 82443BX_AGP	0x7191	82443BX AGP
 product INTEL 82443BX_NOAGP	0x7192	82443BX
 product INTEL 82440MX		0x7194	82440MX Host
 product INTEL 82440MX_ACA	0x7195	82440MX AC97 Audio
 product INTEL 82440MX_ACM	0x7196	82440MX AC97 Modem
-product INTEL 82440MX_ISA	0x7198	82440MX PCI-ISA
+product INTEL 82440MX_ISA	0x7198	82440MX ISA
 product INTEL 82440MX_IDE	0x7199	82440MX IDE
 product INTEL 82440MX_USB	0x719a	82440MX USB
 product INTEL 82440MX_PM	0x719b	82440MX Power Mgmt
-product INTEL 82440BX		0x71a0	82440BX PCI-AGP
+product INTEL 82440BX		0x71a0	82440BX AGP
 product INTEL 82440BX_AGP	0x71a1	82440BX AGP
 product INTEL 82443GX		0x71a2	82443GX
 product INTEL 82740		0x7800	82740 AGP
@@ -1333,7 +1333,7 @@ product INTEL 82451NX		0x84ca	82451NX Mem & IO
 product INTEL 82454NX		0x84cb	82454NX PXB
 product INTEL 82802AB		0x89ad	82802AB Firmware Hub 4Mbit
 product INTEL 82802AC		0x89ac	82802AC Firmware Hub 8Mbit
-product INTEL I2OPCIB		0x9620	I2O RAID PCI to PCI Bridge
+product INTEL I2OPCIB		0x9620	I2O RAID PCI-PCI
 product INTEL RCU21		0x9621	RCU21 I2O RAID
 product INTEL RCUxx		0x9622	RCUxx I2O RAID
 product INTEL RCU31		0x9641	RCU31 I2O RAID
@@ -1378,12 +1378,12 @@ product LANERGY APPIAN_PCI_LITE	0x0001	Appian Lite
 
 /* Lava */
 product LAVA TWOSP_2S		0x0100	Dual Serial
-product LAVA QUATTRO_AB	0x0101  Dual Serial
-product LAVA QUATTRO_CD	0x0102  Dual Serial
+product LAVA QUATTRO_AB		0x0101	Dual Serial
+product LAVA QUATTRO_CD		0x0102	Dual Serial
 product LAVA IOFLEX_2S_0	0x0110	Serial
 product LAVA IOFLEX_2S_1	0x0111	Serial
-product LAVA QUATTRO_AB2	0x0120  Dual Serial
-product LAVA QUATTRO_CD2	0x0121  Dual Serial
+product LAVA QUATTRO_AB2	0x0120	Dual Serial
+product LAVA QUATTRO_CD2	0x0121	Dual Serial
 product LAVA OCTOPUS550_0	0x0180	Quad Serial
 product LAVA OCTOPUS550_1	0x0181	Quad Serial
 product LAVA LAVAPORT_0		0x0201	Serial
@@ -1437,8 +1437,8 @@ product LUCENT LTMODEM_045C	0x045c	LTMODEM
 product LUCENT VENUSMODEM	0x0480	Venus Modem
 product LUCENT USBHC		0x5801	USB
 product LUCENT USBHC2		0x5802	USB 2-port
-product LUCENT USBQBUS		0x5803  USB QuadraBus
-product LUCENT FW322		0x5811  FW322 1394
+product LUCENT USBQBUS		0x5803	USB QuadraBus
+product LUCENT FW322		0x5811	FW322 1394
 
 /* LuxSonor */
 product LUXSONOR LS242		0x0020	LS242 DVD Decoder
@@ -1454,13 +1454,13 @@ product MADGE SMARTRN		0x0001	Smart 16/4 PCI Ringnode
 product MADGE SMARTRN2		0x0002	Smart 16/4 PCI Ringnode Mk2
 product MADGE SMARTRN3		0x0003	Smart 16/4 PCI Ringnode Mk3
 product MADGE SMARTRN1		0x0004	Smart 16/4 PCI Ringnode Mk1
-product MADGE 164CB		0x0006	16/4 Cardbus Adapter
-product MADGE PRESTO		0x0007	Presto PCI Adapter
+product MADGE 164CB		0x0006	16/4 Cardbus
+product MADGE PRESTO		0x0007	Presto PCI
 product MADGE SMARTHSRN100	0x0009	Smart 100/16/4 PCI-HS Ringnode
 product MADGE SMARTRN100	0x000a	Smart 100/16/4 PCI Ringnode
-product MADGE 164CB2		0x000b	16/4 CardBus Adapter Mk2
-product MADGE COLLAGE25		0x1000	Collage 25 ATM adapter
-product MADGE COLLAGE155	0x1001	Collage 155 ATM adapter
+product MADGE 164CB2		0x000b	16/4 CardBus Mk2
+product MADGE COLLAGE25		0x1000	Collage 25 ATM
+product MADGE COLLAGE155	0x1001	Collage 155 ATM
 
 /* Martin-Marietta */
 product MARTINMARIETTA I740	0x00d1	i740 PCI
@@ -1478,9 +1478,9 @@ product MATROX IMPRESSION	0x0d10	MGA Impression
 product MATROX PRODUCTIVA_PCI	0x1000	MGA G100 PCI
 product MATROX PRODUCTIVA_AGP	0x1001	MGA G100 AGP
 product MATROX MYSTIQUE		0x102b	MGA 1064SG
-product MATROX G400_TH		0x2179  MGA G400 Twin Head
-product MATROX MILL_II_G550_AGP 0x2527  MGA G550 AGP
-product MATROX MILL_G200_SD	0xff00  MGA Millennium G200 SD
+product MATROX G400_TH		0x2179	MGA G400 Twin Head
+product MATROX MILL_II_G550_AGP 0x2527	MGA G550 AGP
+product MATROX MILL_G200_SD	0xff00	MGA Millennium G200 SD
 product MATROX PROD_G100_SD	0xff01	MGA Produktiva G100 SD
 product MATROX MYST_G200_SD	0xff02	MGA Mystique G200 SD
 product MATROX MILL_G200_SG	0xff03	MGA Millennium G200 SG
@@ -1494,7 +1494,7 @@ product MENTOR PCI0661		0x0661	PCI-PCI
 product MITSUBISHIELEC GUI	0x0304	GUI Accel
 
 /* Motorola products */
-product MOT MPC105		0x0001	MPC105 PCI bridge
+product MOT MPC105		0x0001	MPC105 PCI
 product MOT MPC106		0x0002	MPC106 Host-PCI
 product MOT SM56		0x5600	SM56
 product MOT RAVEN		0x4801	Raven Host-PCI
@@ -1578,7 +1578,7 @@ product NETSEC 7751		0x7751	7751
 product CMI CMI8338A		0x0100	CMI8338A Audio
 product CMI CMI8338B		0x0101	CMI8338B Audio
 product CMI CMI8738		0x0111	CMI8738/C3DX Audio
-product CMI CMI8738B		0x0112  CMI8738B Audio
+product CMI CMI8738B		0x0112	CMI8738B Audio
 product CMI HSP56		0x0211	HSP56 AMR
 
 /* Netoctave */
@@ -1665,7 +1665,7 @@ product NORTEL 211818A 		0x8030	E-mobility Wireless
 product NUMBER9 I128		0x2309	Imagine-128
 product NUMBER9 I128_2		0x2339	Imagine-128 II
 product NUMBER9 I128_T2R	0x493d	Imagine-128 T2R
-product NUMBER9 I128_T2R4	0x5348  Imagine-128 T2R4
+product NUMBER9 I128_T2R4	0x5348	Imagine-128 T2R4
 
 /* NVidia products */
 product NVIDIA NV1		0x0008	NV1
@@ -1675,7 +1675,7 @@ product NVIDIA RIVA_TNT2	0x0028	Riva TNT2
 product NVIDIA RIVA_TNT2_ULTRA	0x0029	Riva TNT2 Ultra
 product NVIDIA VANTA1		0x002c	Vanta
 product NVIDIA VANTA2		0x002d	Vanta
-product NVIDIA NFORCE2_ISA	0x0060	nForce2 PCI-ISA
+product NVIDIA NFORCE2_ISA	0x0060	nForce2 ISA
 product NVIDIA NFORCE2_SMB	0x0064	nForce2 SMBus
 product NVIDIA NFORCE2_IDE	0x0065	nForce2 IDE
 product NVIDIA NFORCE2_LAN	0x0066	nForce2 LAN
@@ -1721,9 +1721,9 @@ product NVIDIA NFORCE_DDR	0x01ab	nForce 420 DDR
 product NVIDIA NFORCE_MEM	0x01ac	nForce 220/420
 product NVIDIA NFORCE_MEM1	0x01ad	nForce 220/420
 product NVIDIA NFORCE_ACA	0x01b1	nForce AC-97 Audio
-product NVIDIA NFORCE_ISA	0x01b2	nForce PCI-ISA
+product NVIDIA NFORCE_ISA	0x01b2	nForce ISA
 product NVIDIA NFORCE_SMB	0x01b4	nForce SMBus
-product NVIDIA NFORCE_AGP	0x01b7	nForce PCI-AGP
+product NVIDIA NFORCE_AGP	0x01b7	nForce AGP
 product NVIDIA NFORCE_PPB	0x01b8	nForce PCI-PCI
 product NVIDIA NFORCE_IDE	0x01bc	nForce IDE
 product NVIDIA NFORCE_USB	0x01c2	nForce USB
@@ -1760,7 +1760,7 @@ product OMEGA 82C092G		0x1221	82C092G
 
 /* Opti products */
 product OPTI 82C557		0xc557	82C557 Host
-product OPTI 82C558		0xc558	82C558 PCI-ISA
+product OPTI 82C558		0xc558	82C558 ISA
 product OPTI 82C568		0xc568	82C568 IDE
 product OPTI 82D568		0xd568	82D568 IDE
 product OPTI 82C621		0xc621	82C621 IDE
@@ -1775,7 +1775,7 @@ product OXFORD VSCOM_PCI100L	0x8010	VScom PCI 100L
 product OXFORD VSCOM_PCI110L	0x8011	VScom PCI 110L
 product OXFORD VSCOM_PCI200L	0x8020	VScom PCI 200L
 product OXFORD VSCOM_PCI210L	0x8021	VScom PCI 210L
-product MOLEX  VSCOM_PCI400L	0x8040	VScom PCI 400L
+product MOLEX VSCOM_PCI400L	0x8040	VScom PCI 400L
 product OXFORD VSCOM_PCI800L	0x8080	VScom PCI 800L
 product OXFORD VSCOM_PCIx10H	0xa000	VScom PCI x10H
 product OXFORD VSCOM_PCI100H	0xa001	VScom PCI 100H
@@ -1816,9 +1816,9 @@ product RCC CSB6_IDE		0x0213	CSB6 IDE
 product RCC CSB6_IDE2		0x0217	CSB6 IDE
 product RCC USB			0x0220	OSB4/CSB5 USB
 product RCC CSB6_USB		0x0221	CSB6 USB
-product RCC CSB5BRIDGE		0x0225	CSB5 PCI Bridge
+product RCC CSB5BRIDGE		0x0225	CSB5 PCI
 product RCC CSB6_LPC		0x0227	CSB6 LPC
-product RCC ISA			0x0230	PCI/ISA Bridge
+product RCC ISA			0x0230	PCI/ISA
 
 /* Picopower */
 product PICOPOWER PT80C826	0x0000	PT80C826
@@ -1889,15 +1889,15 @@ product REALTEK RT8139		0x8139	8139
 product REALTEK RT8169		0x8169	8169
 
 /* RICOH products */
-product RICOH RF5C465		0x0465	5C465 PCI-CardBus
-product RICOH RF5C466		0x0466	5C466 PCI-CardBus
-product RICOH RF5C475		0x0475	5C475 PCI-CardBus
-product RICOH RF5C476		0x0476	5C476 PCI-CardBus
-product RICOH RF5C477		0x0477	5C477 PCI-CardBus
-product RICOH RF5C478		0x0478	5C478 PCI-CardBus
-product RICOH R5C521		0x0521	5C521 PCI-Firewire
-product RICOH R5C551		0x0551	5C551 PCI-Firewire
-product RICOH RL5C552		0x0552	5C552 PCI-Firewire
+product RICOH RF5C465		0x0465	5C465 CardBus
+product RICOH RF5C466		0x0466	5C466 CardBus
+product RICOH RF5C475		0x0475	5C475 CardBus
+product RICOH RF5C476		0x0476	5C476 CardBus
+product RICOH RF5C477		0x0477	5C477 CardBus
+product RICOH RF5C478		0x0478	5C478 CardBus
+product RICOH R5C521		0x0521	5C521 Firewire
+product RICOH R5C551		0x0551	5C551 Firewire
+product RICOH RL5C552		0x0552	5C552 Firewire
 
 /* Rockwell products */
 product ROCKWELL RS56SP_PCI11P1	0x2005	RS56/SP-PCI11P1 Modem
@@ -1941,7 +1941,7 @@ product S3 SAVAGE_IX		0x8c13	Savage/IX
 product S3 SUPERSAVAGE		0x8c2e	SuperSavage
 product S3 TWISTER		0x8d01	Twister
 product S3 TWISTER_K		0x8d02	Twister-K
-product S3 PROSAVAGE_DDR	0x8d04  ProSavage DDR
+product S3 PROSAVAGE_DDR	0x8d04	ProSavage DDR
 product S3 SONICVIBES		0xca00	SonicVibes
 
 /* SafeNet products */
@@ -1969,9 +1969,9 @@ product SIGMA DVDMAGICPRO	0x8300	DVDmagic-PRO
 product SIS 86C201		0x0001	86C201 Host-AGP
 product SIS 86C202		0x0002	86C202 VGA
 product SIS 86C205_1		0x0005	86C205
-product SIS 85C503		0x0008	85C503 PCI System I/O Chipset
-product SIS 5595		0x0009	5595 PCI System I/O Chipset
-product SIS 85C503_ISA		0x0018	85C503 PCI-ISA
+product SIS 85C503		0x0008	85C503 System
+product SIS 5595		0x0009	5595 System
+product SIS 85C503_ISA		0x0018	85C503 ISA
 product SIS 5597VGA		0x0200	5597/5598 VGA
 product SIS 6215		0x0204	6215
 product SIS 86C205_2		0x0205	86C205
@@ -2067,7 +2067,7 @@ product STB2 RIVA128		0x0018	Velocity128
 product SUN EBUS		0x1000	PCIO Ebus2
 product SUN HME			0x1001	HME
 product SUN EBUSIII		0x1100	PCIO Ebus2 (US III)
-product SUN ERINETWORK		0x1101	ERI Ethernet
+product SUN ERINETWORK		0x1101	ERI Ether
 product SUN FIREWIRE		0x1102	FireWire
 product SUN USB			0x1103	USB
 product SUN GEMNETWORK		0x2bad	GEM
@@ -2078,11 +2078,11 @@ product SUN PSYCHO		0x8000	Psycho PCI
 product SUN MS_IIep		0x9000	microSPARC IIep PCI
 product SUN US_IIi		0xa000	UltraSPARC IIi PCI
 product SUN US_IIe		0xa001	UltraSPARC IIe PCI
-product SUN CE			0xabba	Cassini Ethernet
+product SUN CE			0xabba	Cassini Ether
 
 /* Sundance products */
 product SUNDANCE ST201		0x0201	ST201
-product SUNDANCE ST2021		0x2021	ST2021 Gigabit Ethernet
+product SUNDANCE ST2021		0x2021	ST2021
 
 /* Sunix */
 product SUNIX 40XX		0x7168	40XX
@@ -2102,7 +2102,7 @@ product SYMPHONY 82C101		0x0001	82C101
 product SYMPHONY 82C103		0x0103	82C103
 product SYMPHONY 82C105		0x0105	82C105
 product SYMPHONY2 82C101	0x0001	82C101
-product SYMPHONY 82C565		0x0565	82C565 PCI-ISA
+product SYMPHONY 82C565		0x0565	82C565 ISA
 
 /* Tamarack Microelectronics */
 product TAMARACK TC9021		0x1021	Tamarack TC9021 GigE
@@ -2135,29 +2135,29 @@ product TI TSB43AB23		0x8024	TSB43AB23 FireWire
 product TI TSB43AB21		0x8026	TSB43AB21 FireWire
 product TI PCI4451_FW		0x8027	PCI4451 FireWire
 product TI DWL520P		0x8400	DWL-520+
-product TI PCI1130		0xac12	PCI1130 PCI-CardBus
-product TI PCI1031		0xac13	PCI1031 PCI-pcmcia
-product TI PCI1131		0xac15	PCI1131 PCI-CardBus
-product TI PCI1250		0xac16	PCI1250 PCI-CardBus
-product TI PCI1220		0xac17	PCI1220 PCI-CardBus
-product TI PCI1221		0xac19	PCI1221 PCI-CardBus
-product TI PCI1450		0xac1b	PCI1450 PCI-CardBus
-product TI PCI1225		0xac1c	PCI1225 PCI-CardBus
-product TI PCI1251		0xac1d	PCI1251 PCI-CardBus
-product TI PCI1211		0xac1e	PCI1211 PCI-CardBus
-product TI PCI1251B		0xac1f	PCI1251B PCI-CardBus
+product TI PCI1130		0xac12	PCI1130 CardBus
+product TI PCI1031		0xac13	PCI1031 pcmcia
+product TI PCI1131		0xac15	PCI1131 CardBus
+product TI PCI1250		0xac16	PCI1250 CardBus
+product TI PCI1220		0xac17	PCI1220 CardBus
+product TI PCI1221		0xac19	PCI1221 CardBus
+product TI PCI1450		0xac1b	PCI1450 CardBus
+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 PCI4451_CB		0xac42	PCI4451 PCI-CardBus
-product TI PCI4510		0xac44	PCI4510 PCI-CardBus
-product TI PCI4520		0xac46	PCI4520 PCI-CardBus
-product TI PCI1410		0xac50	PCI1410 PCI-CardBus
-product TI PCI1420		0xac51	PCI1420 PCI-CardBus
-product TI PCI1451		0xac52	PCI1451 PCI-CardBus
-product TI PCI1421		0xac53	PCI1421 PCI-CardBus
-product TI PCI1520		0xac55	PCI1520 PCI-CardBus
-product TI PCI1510		0xac56	PCI1510 PCI-CardBus
-product TI PCI2040		0xac60	PCI2040 PCI-DSP
+product TI PCI4451_CB		0xac42	PCI4451 CardBus
+product TI PCI4510		0xac44	PCI4510 CardBus
+product TI PCI4520		0xac46	PCI4520 CardBus
+product TI PCI1410		0xac50	PCI1410 CardBus
+product TI PCI1420		0xac51	PCI1420 CardBus
+product TI PCI1451		0xac52	PCI1451 CardBus
+product TI PCI1421		0xac53	PCI1421 CardBus
+product TI PCI1520		0xac55	PCI1520 CardBus
+product TI PCI1510		0xac56	PCI1510 CardBus
+product TI PCI2040		0xac60	PCI2040 DSP
 
 /* TigerJet Network products */
 product TIGERJET TIGER320	0x0001	PCI interface
@@ -2172,11 +2172,11 @@ product TOSHIBA	R4X00		0x102f	R4x00 Host-PCI
 
 /* Toshiba(2) products */
 product TOSHIBA2 THB 		0x0601	Host-PCI
-product TOSHIBA2 ISA 		0x0602	PCI-ISA
+product TOSHIBA2 ISA 		0x0602	ISA
 product TOSHIBA2 ToPIC95	0x0603	ToPIC95 CardBus-PCI
-product TOSHIBA2 ToPIC95B	0x060a	ToPIC95B PCI-CardBus
-product TOSHIBA2 ToPIC97	0x060f	ToPIC97 PCI-CardBus
-product TOSHIBA2 ToPIC100	0x0617	ToPIC100 PCI-CardBus
+product TOSHIBA2 ToPIC95B	0x060a	ToPIC95B CardBus
+product TOSHIBA2 ToPIC97	0x060f	ToPIC97 CardBus
+product TOSHIBA2 ToPIC100	0x0617	ToPIC100 CardBus
 product TOSHIBA2 TFIRO		0x0701	Fast Infrared Type O
 
 /* Transmeta products */
@@ -2231,7 +2231,7 @@ product TSENG ET6000		0x3208	ET6000/ET6100
 product TSENG ET6300		0x4702	ET6300
 
 /* UMC products */
-product UMC UM82C881		0x0001	UM82C881 486 Chipset
+product UMC UM82C881		0x0001	UM82C881 486
 product UMC UM82C886		0x0002	UM82C886 ISA
 product UMC UM8673F		0x0101	UM8673F EIDE
 product UMC UM8881		0x0881	UM8881 HB4 486 PCI
@@ -2240,12 +2240,12 @@ product UMC UM886A		0x1001	UM886A
 product UMC UM8886BF		0x673a	UM8886BF
 product UMC UM8710		0x8710	UM8710
 product UMC UM8886		0x886a	UM8886
-product UMC UM8881F		0x8881	UM8881F PCI-Host
-product UMC UM8886F		0x8886	UM8886F PCI-ISA
+product UMC UM8881F		0x8881	UM8881F Host
+product UMC UM8886F		0x8886	UM8886F ISA
 product UMC UM8886A		0x888a	UM8886A
 product UMC UM8891A		0x8891	UM8891A
 product UMC UM9017F		0x9017	UM9017F
-product UMC UM8886E_OR_WHAT	0xe886	PCI-ISA
+product UMC UM8886E_OR_WHAT	0xe886	ISA
 product UMC UM8886N		0xe88a	UM8886N
 product UMC UM8891N		0xe891	UM8891N
 
@@ -2270,20 +2270,20 @@ product VIATECH	VT82C505	0x0505	VT82C505
 product VIATECH	VT82C561	0x0561	VT82C561
 product VIATECH	VT82C571	0x0571	VT82C571 IDE
 product VIATECH	VT82C576	0x0576	VT82C576 3V
-product VIATECH	VT82C585	0x0585	VT82C585 PCI-ISA
-product VIATECH	VT82C586_ISA	0x0586	VT82C586 PCI-ISA
+product VIATECH	VT82C585	0x0585	VT82C585 ISA
+product VIATECH	VT82C586_ISA	0x0586	VT82C586 ISA
 product VIATECH	VT82C595	0x0595	VT82C595 Host-PCI
-product VIATECH	VT82C596A	0x0596	VT82C596A PCI-ISA
+product VIATECH	VT82C596A	0x0596	VT82C596A ISA
 product VIATECH	VT82C597PCI	0x0597	VT82C597 Host-PCI
 product VIATECH	VT82C598PCI	0x0598	VT82C598 Host-PCI
 product VIATECH	VT8601		0x0601	VT8601 Host-PCI
 product VIATECH	VT8605		0x0605	VT8605 Host-PCI
-product VIATECH	VT82C686A_ISA	0x0686	VT82C686 PCI-ISA
+product VIATECH	VT82C686A_ISA	0x0686	VT82C686 ISA
 product VIATECH	VT82C691	0x0691	VT82C691 Host-PCI
 product VIATECH	VT82C693	0x0693	VT82C693 Host-PCI
 product VIATECH	VT86C926	0x0926	VT86C926 Amazon
 product VIATECH	VT82C570M	0x1000	VT82C570M Host-PCI
-product VIATECH	VT82C570MV	0x1006	VT82C570M PCI-ISA
+product VIATECH	VT82C570MV	0x1006	VT82C570M ISA
 product VIATECH	VT82C416	0x1571	VT82C416 IDE
 product VIATECH	VT82C1595	0x1595	VT82C1595 Host-PCI
 product VIATECH	VT83C572	0x3038	VT83C572 USB
@@ -2296,33 +2296,33 @@ product VIATECH	VT82C686A_AC97	0x3058	VT82C686 AC97 Audio
 product VIATECH	VT8233_AC97	0x3059	VT8233 AC97 Audio
 product VIATECH	RHINEII_2	0x3065	RhineII-2
 product VIATECH	VT82C686A_ACM	0x3068	VT82C686 AC97 Modem
-product VIATECH	VT8366_ISA	0x3074	VT8366 PCI-ISA
+product VIATECH	VT8366_ISA	0x3074	VT8366 ISA
 product VIATECH	VT8366		0x3099	VT8366 Host-PCI
 product VIATECH	VT6202		0x3104	VT6202 USB 2.0
 product VIATECH	VT6105		0x3106	VT6105 RhineIII
 product VIATECH	VT8375		0x3116	VT8375 Host-PCI
 product VIATECH	CLE266		0x3122	CLE266
 product VIATECH	VT8623		0x3123	VT8623 Host-PCI
-product VIATECH	VT8233_ISA	0x3147	VT8233 PCI-ISA
+product VIATECH	VT8233_ISA	0x3147	VT8233 ISA
 product VIATECH	VT8751		0x3148	VT8751 Host-PCI
 product VIATECH	VT8237_SATA	0x3149	VT8237 SATA
-product VIATECH	VT8235_ISA	0x3177	VT8235 PCI-ISA
+product VIATECH	VT8235_ISA	0x3177	VT8235 ISA
 product VIATECH VT8377		0x3189	VT8377 Host-PCI
-product VIATECH	VT8237_ISA	0x3227	VT8237 PCI-ISA
+product VIATECH	VT8237_ISA	0x3227	VT8237 ISA
 product VIATECH	RHINEII		0x6100	RhineII
-product VIATECH	VT8231_ISA	0x8231	VT8231 PCI-ISA
+product VIATECH	VT8231_ISA	0x8231	VT8231 ISA
 product VIATECH	VT8231_PWR	0x8235	VT8231 PMG
-product VIATECH	VT8363_AGP	0x8305	VT8363 PCI-AGP
+product VIATECH	VT8363_AGP	0x8305	VT8363 AGP
 product VIATECH	VT8371_PPB	0x8391	VT8371 PCI-PCI
-product VIATECH	VT8501_AGP	0x8501	VT8501 PCI-AGP
-product VIATECH	VT82C601	0x8601	VT82C601 PCI-AGP
-product VIATECH	VT82C597AGP	0x8597	VT82C597 PCI-AGP
-product VIATECH	VT82C598AGP	0x8598	VT82C598 PCI-AGP
-product VIATECH	VT8605_AGP	0x8605	VT8605 PCI-AGP
-product VIATECH	VT8633_AGP	0xb091	VT8633 PCI-AGP
-product VIATECH	VT8366_AGP	0xb099	VT8366 PCI-AGP
-product VIATECH	VT8235_AGP	0xb168	VT8235 PCI-AGP
-product VIATECH	VT8377_AGP	0xb198	VT8377 PCI-AGP
+product VIATECH	VT8501_AGP	0x8501	VT8501 AGP
+product VIATECH	VT82C601	0x8601	VT82C601 AGP
+product VIATECH	VT82C597AGP	0x8597	VT82C597 AGP
+product VIATECH	VT82C598AGP	0x8598	VT82C598 AGP
+product VIATECH	VT8605_AGP	0x8605	VT8605 AGP
+product VIATECH	VT8633_AGP	0xb091	VT8633 AGP
+product VIATECH	VT8366_AGP	0xb099	VT8366 AGP
+product VIATECH	VT8235_AGP	0xb168	VT8235 AGP
+product VIATECH	VT8377_AGP	0xb198	VT8377 AGP
 
 /* Vortex Computer Systems products */
 product VORTEX GDT_60x0		0x0000	GDT6000/6020/6050
@@ -2431,9 +2431,9 @@ product WD 90C			0xc24a	90C
 product WINBOND W83769F		0x0001	W83769F
 product WINBOND W89C840F	0x0840	W89C840F 10/100
 product WINBOND W89C940F	0x0940	Linksys EtherPCI II
-product WINBOND W83C553F_0	0x0565	W83C553F PCI-ISA Bridge
-product WINBOND W83C553F_1	0x0105	W83C553F IDE Controller
-product WINBOND W89C940F_1	0x5a5a	W89C940F Ethernet
+product WINBOND W83C553F_0	0x0565	W83C553F ISA
+product WINBOND W83C553F_1	0x0105	W83C553F
+product WINBOND W89C940F_1	0x5a5a	W89C940F
 product WINBOND W6692		0x6692	W6692 ISDN
 
 /* Winbond Electronics products (PCI products set 2) */
@@ -2442,7 +2442,7 @@ product WINBOND2 W89C940	0x1980	Linksys EtherPCI
 /* Xircom products */
 product XIRCOM X3201_3		0x0002	X3201-3
 product XIRCOM X3201_3_21143	0x0003	X3201-3 (21143)
-product XIRCOM MPCI_MODEM	0x000c	MiniPCI Modem
+product XIRCOM MPCI_MODEM	0x000c	Modem
 
 /* Yamaha products */
 product YAMAHA YMF724		0x0004	724