sort by vendor define and device id

1 files changed, 655 insertions, 659 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 6fa30dac7fb..29f4b0119ba 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1908 2020/01/05 03:38:22 jsg Exp $
+$OpenBSD: pcidevs,v 1.1909 2020/01/05 06:43:47 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -380,32 +380,10 @@ vendor	INVALID		0xffff	INVALID VENDOR ID
  * List of known products.  Grouped by vendor.
  */
 
-/* O2 Micro */
-product O2MICRO FIREWIRE	0x00f7	Firewire
-product O2MICRO OZ6729		0x6729	OZ6729 CardBus
-product O2MICRO OZ6730		0x673a	OZ6730 CardBus
-product O2MICRO OZ6922		0x6825	OZ6922 CardBus
-product O2MICRO OZ6832		0x6832	OZ6832 CardBus
-product O2MICRO OZ6836		0x6836	OZ6836/OZ6860 CardBus
-product O2MICRO OZ6872		0x6872	OZ68[17]2 CardBus
-product O2MICRO OZ6933		0x6933	OZ6933 CardBus
-product O2MICRO OZ6972		0x6972	OZ69[17]2 CardBus
-product O2MICRO OZ7110		0x7110	OZ711Mx Misc
-product O2MICRO OZ7113		0x7113	OZ711EC1 SmartCardBus
-product O2MICRO OZ7114		0x7114	OZ711M1 CardBus
-product O2MICRO OZ7120		0x7120	OZ711MP1 SDHC
-product O2MICRO OZ7130		0x7130	OZ711MP1 XDHC
-product O2MICRO OZ7134		0x7134	OZ711MP1 CardBus
-product O2MICRO OZ7135		0x7135	OZ711EZ1 CardBus
-product O2MICRO OZ7136		0x7136	OZ711SP1 CardBus
-product O2MICRO OZ7223		0x7223	OZ711E0 CardBus
-product O2MICRO OZ8621		0x8621	0Z8621 SD/MMC
-
 /* 3Com Products */
 product 3COM 3C985		0x0001	3c985
 product 3COM 3C996		0x0003	3c996
 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
@@ -458,6 +436,7 @@ product 3COM 3CR990FX		0x9905	3cr990-FX
 product 3COM 3CR990SVR95	0x9908	3cr990SVR95
 product 3COM 3CR990SVR97	0x9909	3cr990SVR97
 product 3COM 3C990BSVR		0x990a	3c990BSVR
+product 3COM2 3CRPAG175		0x0013	3CRPAG175
 
 /* 3DFX Interactive */
 product 3DFX VOODOO		0x0001	Voodoo
@@ -496,18 +475,6 @@ product ABOCOM PCM200		0xab03	PCM200
 product ABOCOM FE2000VX		0xab06	FE2000VX
 product ABOCOM FE2500MX		0xab08	FE2500MX
 
-/* Aironet Products */
-product AIRONET PC4800_1	0x0001	PC4800
-product AIRONET PCI352		0x0350	PCI35x
-product AIRONET PC4500		0x4500	PC4500
-product AIRONET PC4800		0x4800	PC4800
-product AIRONET MPI350		0xa504	MPI-350
-
-/* ACC Products */
-product ACC 2188		0x0000	ACCM 2188 VL-PCI
-product ACC 2051_HB		0x2051	2051 PCI
-product ACC 2051_ISA		0x5842	2051 ISA
-
 /* Acard products */
 product ACARD ATP850U		0x0005	ATP850U/UF
 product ACARD ATP860		0x0006	ATP860
@@ -521,68 +488,29 @@ product ACARD AEC6712S		0x8030	AEC6712S
 product ACARD AEC6710D		0x8040	AEC6710D
 product ACARD AEC6715UW		0x8050	AEC6715UW
 
+/* ACC Products */
+product ACC 2188		0x0000	ACCM 2188 VL-PCI
+product ACC 2051_HB		0x2051	2051 PCI
+product ACC 2051_ISA		0x5842	2051 ISA
+
 /* Accton products */
 product ACCTON 5030		0x1211	MPX 5030/5038
 product ACCTON EN2242		0x1216	EN2242
 product ACCTON EN1217		0x1217	EN1217
 
+/* Acer products */
+product ACER M1435		0x1435	M1435 VL-PCI
+
+/* Analog Devices */
+product AD SP21535		0x1535	ADSP 21535 DSP
+product AD 1889			0x1889	AD1889 Audio
+product AD SP2141		0x2f44	SafeNet ADSP 2141
+
 /* Addtron products */
 product ADDTRON RHINEII		0x1320	RhineII
 product ADDTRON 8139		0x1360	rtl8139
 product ADDTRON AWA100		0x7001	AWA-100
 
-/* Acer products */
-product ACER M1435		0x1435	M1435 VL-PCI
-
-/* Acer Labs products */
-product ALI M1445		0x1445	M1445 VL-PCI
-product ALI M1449		0x1449	M1449 ISA
-product ALI M1451		0x1451	M1451 PCI
-product ALI M1461		0x1461	M1461 PCI
-product ALI M1489		0x1489	M1489 PCI
-product ALI M1511		0x1511	M1511 PCI
-product ALI M1513		0x1513	M1513 ISA
-product ALI M1521		0x1521	M1523 PCI
-product ALI M1523		0x1523	M1523 ISA
-product ALI M1531		0x1531	M1531 PCI
-product ALI M1533		0x1533	M1533 ISA
-product ALI M1535		0x1535	M1535 PCI
-product ALI M1541		0x1541	M1541 PCI
-product ALI M1543		0x1543	M1543 ISA
-product ALI M1563		0x1563	M1563 ISA
-product ALI M1573		0x1573	M1573 ISA
-product ALI M1575		0x1575	M1575 ISA
-product ALI M1621		0x1621	M1621 PCI
-product ALI M1631		0x1631	M1631 PCI
-product ALI M1644		0x1644	M1644 PCI
-product ALI M1647		0x1647	M1647 PCI
-product ALI M1689		0x1689	M1689 PCI
-product ALI M1695		0x1695	M1695 PCI
-product ALI M3309		0x3309	M3309 MPEG
-product ALI M4803		0x5215	M4803
-product ALI M5219		0x5219	M5219 UDMA IDE
-product ALI M5229		0x5229	M5229 UDMA IDE
-product ALI M5237		0x5237	M5237 USB
-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
-product ALI M524B		0x524b	M524B PCIE
-product ALI M524C		0x524c	M524C PCIE
-product ALI M524D		0x524d	M524D PCIE
-product ALI M5261		0x5261	M5261 LAN
-product ALI M5263		0x5263	M5263 LAN
-product ALI M5281		0x5281	M5281 SATA
-product ALI M5287		0x5287	M5287 SATA
-product ALI M5288		0x5288	M5288 SATA
-product ALI M5289		0x5289	M5289 SATA
-product ALI M5451		0x5451	M5451 Audio
-product ALI M5455		0x5455	M5455 Audio
-product ALI M5457		0x5457	M5457 Modem
-product ALI M5461		0x5461	M5461 HD Audio
-product ALI M7101		0x7101	M7101 Power
-
 /* ADMtek products */
 product ADMTEK AL981		0x0981	AL981
 product ADMTEK AN983		0x0985	AN983
@@ -602,32 +530,32 @@ product ADP AIC5905		0x5905	AIC-5905 ATM
 product ADP 1480		0x6075	APA-1480
 product ADP AIC7860		0x6078	AIC-7860
 product ADP 2940AU		0x6178	AHA-2940AU
+product ADP AIC6915		0x6915	AIC-6915
 product ADP AIC7870		0x7078	AIC-7870
 product ADP 2940		0x7178	AHA-2940
 product ADP 3940		0x7278	AHA-3940
 product ADP 3985		0x7378	AHA-3985
 product ADP 2944		0x7478	AHA-2944
 product ADP AIC7815		0x7815	AIC-7815
+product ADP 7895		0x7895	AIC-7895
 product ADP AIC7880		0x8078	AIC-7880
 product ADP 2940U		0x8178	AHA-2940U
 product ADP 3940U		0x8278	AHA-3940U
 product ADP 398XU		0x8378	AHA-398XU
 product ADP 2944U		0x8478	AHA-2944U
 product ADP 2940UWPRO		0x8778	AHA-2940UWPro
-product ADP AIC6915		0x6915	AIC-6915
-product ADP 7895		0x7895	AIC-7895
 
 product ADP2 2940U2		0x0010	AHA-2940U2 U2
 product ADP2 2930U2		0x0011	AHA-2930U2 U2
 product ADP2 AAA131U2		0x0013	AAA-131U2 U2
 product ADP2 AIC7890		0x001f	AIC-7890/1 U2
-product ADP2 AIC7892		0x008f	AIC-7892 U160
-product ADP2 29160		0x0080	AHA-29160 U160
-product ADP2 19160B		0x0081	AHA-19160B U160
-product ADP2 2930LP		0x0082	AVA-2930LP
 product ADP2 3950U2B		0x0050	AHA-3950U2B U2
 product ADP2 3950U2D		0x0051	AHA-3950U2D U2
 product ADP2 AIC7896		0x005f	AIC-7896/7 U2
+product ADP2 29160		0x0080	AHA-29160 U160
+product ADP2 19160B		0x0081	AHA-19160B U160
+product ADP2 2930LP		0x0082	AVA-2930LP
+product ADP2 AIC7892		0x008f	AIC-7892 U160
 product ADP2 3960D		0x00c0	AHA-3960D U160
 product ADP2 AIC7899B		0x00c1	AIC-7899B
 product ADP2 AIC7899D		0x00c3	AIC-7899D
@@ -640,20 +568,20 @@ product ADP2 ASR2120S		0x0286	ASR-2120S
 product ADP2 AAC364		0x0364	AAC-364
 product ADP2 AAC3642		0x0365	AAC-3642
 product ADP2 PERC_2QC		0x1364	Dell PERC 2/QC
-product ADP2 AIC7901		0x800f	AIC-7901 U320
 product ADP2 AHA29320A		0x8000	AHA-29320A U320
-product ADP2 AHA29320LP		0x8017	AHA-29320LP U320
-product ADP2 AIC7901A		0x801e	AIC-7901A U320
+product ADP2 AIC7901		0x800f	AIC-7901 U320
+product ADP2 AHA39320		0x8010	AHA-39320 U320
+product ADP2 AHA39320D		0x8011	AHA-39320D U320
 product ADP2 AHA29320		0x8012	AHA-29320 U320
 product ADP2 AHA29320B		0x8013	AHA-29320B U320
 product ADP2 AHA29320LP2	0x8014	AHA-29320LP U320
-product ADP2 AIC7902		0x801f	AIC-7902 U320
-product ADP2 AIC7902_B		0x801d	AIC-7902B U320
-product ADP2 AHA39320		0x8010	AHA-39320 U320
 product ADP2 AHA39320B		0x8015	AHA-39320B U320
 product ADP2 AHA39320A		0x8016	AHA-39320A U320
-product ADP2 AHA39320D		0x8011	AHA-39320D U320
+product ADP2 AHA29320LP		0x8017	AHA-29320LP U320
 product ADP2 AHA39320DB		0x801c	AHA-39320DB U320
+product ADP2 AIC7902_B		0x801d	AIC-7902B U320
+product ADP2 AIC7901A		0x801e	AIC-7901A U320
+product ADP2 AIC7902		0x801f	AIC-7902 U320
 
 /* Advanced System Products */
 product ADVSYS 1200A		0x1100	1200A
@@ -663,15 +591,65 @@ product ADVSYS WIDE		0x2300	ABP-940UW
 product ADVSYS U2W		0x2500	ASP-3940U2W
 product ADVSYS U3W		0x2700	ASP-3940U3W
 
-/* Advanced Telecommunications Modules */
-product ATML WAIKATO		0x3200	Waikato Dag3.2
-product ATML DAG35		0x3500	Endace Dag3.5
-product ATML DAG422GE		0x422e	Endace Dag4.22GE
-product ATML DAG423		0x4230	Endace Dag4.23
-
 /* Ageia */
 product AGEIA PHYSX		0x1011	PhysX
 
+/* Aironet Products */
+product AIRONET PC4800_1	0x0001	PC4800
+product AIRONET PCI352		0x0350	PCI35x
+product AIRONET PC4500		0x4500	PC4500
+product AIRONET PC4800		0x4800	PC4800
+product AIRONET MPI350		0xa504	MPI-350
+
+/* Acer Labs products */
+product ALI M1445		0x1445	M1445 VL-PCI
+product ALI M1449		0x1449	M1449 ISA
+product ALI M1451		0x1451	M1451 PCI
+product ALI M1461		0x1461	M1461 PCI
+product ALI M1489		0x1489	M1489 PCI
+product ALI M1511		0x1511	M1511 PCI
+product ALI M1513		0x1513	M1513 ISA
+product ALI M1521		0x1521	M1523 PCI
+product ALI M1523		0x1523	M1523 ISA
+product ALI M1531		0x1531	M1531 PCI
+product ALI M1533		0x1533	M1533 ISA
+product ALI M1535		0x1535	M1535 PCI
+product ALI M1541		0x1541	M1541 PCI
+product ALI M1543		0x1543	M1543 ISA
+product ALI M1563		0x1563	M1563 ISA
+product ALI M1573		0x1573	M1573 ISA
+product ALI M1575		0x1575	M1575 ISA
+product ALI M1621		0x1621	M1621 PCI
+product ALI M1631		0x1631	M1631 PCI
+product ALI M1644		0x1644	M1644 PCI
+product ALI M1647		0x1647	M1647 PCI
+product ALI M1689		0x1689	M1689 PCI
+product ALI M1695		0x1695	M1695 PCI
+product ALI M3309		0x3309	M3309 MPEG
+product ALI M4803		0x5215	M4803
+product ALI M5219		0x5219	M5219 UDMA IDE
+product ALI M5229		0x5229	M5229 UDMA IDE
+product ALI M5237		0x5237	M5237 USB
+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
+product ALI M524B		0x524b	M524B PCIE
+product ALI M524C		0x524c	M524C PCIE
+product ALI M524D		0x524d	M524D PCIE
+product ALI M5261		0x5261	M5261 LAN
+product ALI M5263		0x5263	M5263 LAN
+product ALI M5281		0x5281	M5281 SATA
+product ALI M5287		0x5287	M5287 SATA
+product ALI M5288		0x5288	M5288 SATA
+product ALI M5289		0x5289	M5289 SATA
+product ALI M5451		0x5451	M5451 Audio
+product ALI M5455		0x5455	M5455 Audio
+product ALI M5457		0x5457	M5457 Modem
+product ALI M5461		0x5461	M5461 HD Audio
+product ALI M7101		0x7101	M7101 Power
+
 /* Alliance products */
 product ALLIANCE AT22		0x6422	AT22
 product ALLIANCE AT24		0x6424	AT24
@@ -691,6 +669,10 @@ product ALTIMA AC1001		0x03e9	AC1001
 product ALTIMA AC9100		0x03ea	AC9100
 product ALTIMA AC1003		0x03eb	AC1003
 
+/* Applied Micro Circuits products */
+product AMCIRCUITS S5933	0x4750	S5933 PCI Matchmaker
+product AMCIRCUITS LANAI	0x8043	Myrinet LANai
+
 /* AMD products */
 product AMD 0F_HT		0x1100	0Fh HyperTransport
 product AMD 0F_ADDR		0x1101	0Fh Address Map
@@ -945,10 +927,15 @@ product AMI MEGARAID		0x1960	MegaRAID
 product AMI MEGARAID428		0x9010	MegaRAID Series 428
 product AMI MEGARAID434		0x9060	MegaRAID Series 434
 
-/* Analog Devices */
-product AD SP21535		0x1535	ADSP 21535 DSP
-product AD 1889			0x1889	AD1889 Audio
-product AD SP2141		0x2f44	SafeNet ADSP 2141
+/* Ampere Computing */
+product AMPERE EMAG_PCIE_1	0xe005	eMAG PCIE
+product AMPERE EMAG_PCIE_2	0xe006	eMAG PCIE
+product AMPERE EMAG_PCIE_3	0xe007	eMAG PCIE
+product AMPERE EMAG_PCIE_4	0xe008	eMAG PCIE
+product AMPERE EMAG_PCIE_5	0xe009	eMAG PCIE
+product AMPERE EMAG_PCIE_6	0xe00a	eMAG PCIE
+product AMPERE EMAG_PCIE_7	0xe00b	eMAG PCIE
+product AMPERE EMAG_PCIE_8	0xe00c	eMAG PCIE
 
 /* Antares Microsystems products */
 product ANTARES TC9021		0x1021	TC9021
@@ -959,10 +946,10 @@ product APPLE GC		0x0002	GC
 product APPLE OHARE		0x0007	OHare
 product APPLE HEATHROW		0x0010	Heathrow
 product APPLE PADDINGTON	0x0017	Paddington
-product APPLE UNINORTHETH	0x001e	Uni-N Eth
-product APPLE UNINORTH		0x001f	Uni-N
 product APPLE UNINORTHETH_FW	0x0018	Uni-N Eth Firewire
 product APPLE USB		0x0019	USB
+product APPLE UNINORTHETH	0x001e	Uni-N Eth
+product APPLE UNINORTH		0x001f	Uni-N
 product APPLE UNINORTH_AGP	0x0020	Uni-N AGP
 product APPLE UNINORTHGMAC	0x0021	Uni-N GMAC
 product APPLE KEYLARGO		0x0022	Keylargo
@@ -1065,9 +1052,51 @@ product ASMEDIA ASM1184E	0x1184	ASM1184e
 product ASMEDIA ASM1042AE	0x1242	ASM1042AE xHCI
 product ASMEDIA ASM1143		0x1343	ASM1143 xHCI
 
+/* ASPEED Technology products */
+product ASPEED AST1150		0x1150	AST1150 PCI
+product ASPEED AST1180		0x1180	AST1180
+product ASPEED AST2000		0x2000	AST2000
+product ASPEED AST2100		0x2100	AST2100
+
 /* Asustek products */
 product ASUSTEK HFCPCI		0x0675	ISDN
 
+/* Atheros products */
+product ATHEROS AR5210		0x0007	AR5210
+product ATHEROS AR5311		0x0011	AR5311
+product ATHEROS AR5211		0x0012	AR5211
+product ATHEROS AR5212		0x0013	AR5212
+product ATHEROS AR5212_2	0x0014	AR5212
+product ATHEROS AR5212_3	0x0015	AR5212
+product ATHEROS AR5212_4	0x0016	AR5212
+product ATHEROS AR5212_5	0x0017	AR5212
+product ATHEROS AR5212_6	0x0018	AR5212
+product ATHEROS AR5212_7	0x0019	AR5212
+product ATHEROS AR2413		0x001a	AR2413
+product ATHEROS AR5413		0x001b	AR5413
+product ATHEROS AR5424		0x001c	AR5424
+product ATHEROS AR5416		0x0023	AR5416
+product ATHEROS AR5418		0x0024	AR5418
+product ATHEROS AR9160		0x0027	AR9160
+product ATHEROS AR9280		0x0029	AR9280
+product ATHEROS AR9281		0x002a	AR9281
+product ATHEROS AR9285		0x002b	AR9285
+product ATHEROS AR2427		0x002c	AR2427
+product ATHEROS AR9227		0x002d	AR9227
+product ATHEROS AR9287		0x002e	AR9287
+product ATHEROS AR9300		0x0030	AR9300
+product ATHEROS AR9485		0x0032	AR9485
+product ATHEROS AR9462		0x0034	AR9462
+product ATHEROS AR9565		0x0036	AR9565
+product ATHEROS AR5210_AP	0x0207	AR5210
+product ATHEROS AR5212_IBM	0x1014	AR5212
+product ATHEROS AR5210_DEFAULT	0x1107	AR5210
+product ATHEROS AR5211_DEFAULT	0x1112	AR5211
+product ATHEROS AR5212_DEFAULT	0x1113	AR5212
+product ATHEROS AR5212_FPGA	0xf013	AR5212
+product ATHEROS AR5211_FPGA11B	0xf11b	AR5211Ref
+product ATHEROS AR5211_LEGACY	0xff12	AR5211Ref
+
 /* ATI Technologies */
 product ATI KAVERI_1		0x1304	Kaveri
 product ATI KAVERI_2		0x1305	Kaveri
@@ -2112,55 +2141,15 @@ product ATI RS200_AGP		0xcab2	RS200 AGP
 product ATI RS250_AGP		0xcab3	RS250 AGP
 product ATI RS200M_AGP		0xcbb2	RS200M AGP
 
-/* Applied Micro Circuits products */
-product AMCIRCUITS S5933	0x4750	S5933 PCI Matchmaker
-product AMCIRCUITS LANAI	0x8043	Myrinet LANai
-
-/* ASPEED Technology products */
-product ASPEED AST1150		0x1150	AST1150 PCI
-product ASPEED AST1180		0x1180	AST1180
-product ASPEED AST2000		0x2000	AST2000
-product ASPEED AST2100		0x2100	AST2100
-
-/* Atheros products */
-product ATHEROS AR5210		0x0007	AR5210
-product ATHEROS AR5311		0x0011	AR5311
-product ATHEROS AR5211		0x0012	AR5211
-product ATHEROS AR5212		0x0013	AR5212
-product ATHEROS AR5212_2	0x0014	AR5212
-product ATHEROS AR5212_3	0x0015	AR5212
-product ATHEROS AR5212_4	0x0016	AR5212
-product ATHEROS AR5212_5	0x0017	AR5212
-product ATHEROS AR5212_6	0x0018	AR5212
-product ATHEROS AR5212_7	0x0019	AR5212
-product ATHEROS AR2413		0x001a	AR2413
-product ATHEROS AR5413		0x001b	AR5413
-product ATHEROS AR5424		0x001c	AR5424
-product ATHEROS AR5416		0x0023	AR5416
-product ATHEROS AR5418		0x0024	AR5418
-product ATHEROS AR9160		0x0027	AR9160
-product ATHEROS AR9280		0x0029	AR9280
-product ATHEROS AR9281		0x002a	AR9281
-product ATHEROS AR9285		0x002b	AR9285
-product ATHEROS AR2427		0x002c	AR2427
-product ATHEROS AR9227		0x002d	AR9227
-product ATHEROS AR9287		0x002e	AR9287
-product ATHEROS AR9300		0x0030	AR9300
-product ATHEROS AR9485		0x0032	AR9485
-product ATHEROS AR9462		0x0034	AR9462
-product ATHEROS AR9565		0x0036	AR9565
-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
-
 /* Atmel products */
 product ATMEL AT76C506		0x0506	AT76C506
 
+/* Advanced Telecommunications Modules */
+product ATML WAIKATO		0x3200	Waikato Dag3.2
+product ATML DAG35		0x3500	Endace Dag3.5
+product ATML DAG422GE		0x422e	Endace Dag4.22GE
+product ATML DAG423		0x4230	Endace Dag4.23
+
 /* Atronics products */
 product ATRONICS IDE_2015PL	0x2015	IDE-2015PL
 
@@ -2209,10 +2198,10 @@ product AVM T1			0x1200	PRI T1 ISDN
 product AWT RT2890		0x1059	RT2890
 
 /* Belkin Components products */
+product BELKIN F5D6000		0xec00	F5D6000
 product BELKIN2 F5D6001		0x6001	F5D6001
 product BELKIN2 F5D6020V3	0x6020	F5D6020V3
 product BELKIN2 F5D7010		0x701f	F5D7010
-product BELKIN F5D6000		0xec00	F5D6000
 
 /* Bit3 products */
 product BIT3 PCIVME617		0x0001	VME 617
@@ -2225,6 +2214,9 @@ product BLUESTEEL 5601		0x5601	5601
 /* Bochs */
 product BOCHS VGA		0x1111	VGA
 
+/* Brainboxes */
+product	BRAINBOXES IS200_BB16PCI958	0x0d80	IS200 BB16PCI958
+
 /* Broadcom */
 product BROADCOM BCM43224_1	0x0576	BCM43224
 product BROADCOM BCM15700A2	0x1570	BCM15700A2
@@ -2452,13 +2444,13 @@ product CHELSIO T3B02		0x0032	T3B02 10GbE
 
 /* Chips and Technologies products */
 product CHIPS 64310		0x00b8	64310
+product CHIPS 69000		0x00c0	69000
 product CHIPS 65545		0x00d8	65545
 product CHIPS 65548		0x00dc	65548
 product CHIPS 65550		0x00e0	65550
 product CHIPS 65554		0x00e4	65554
 product CHIPS 65555		0x00e5	65555
 product CHIPS 68554		0x00f4	68554
-product CHIPS 69000		0x00c0	69000
 product CHIPS 69030		0x0c30	69030
 
 /* Cirrus Logic products */
@@ -2479,8 +2471,8 @@ product CIRRUS CL_GD7542	0x1200	CL-GD7542
 product CIRRUS CL_GD7543	0x1202	CL-GD7543
 product CIRRUS CL_GD7541	0x1204	CL-GD7541
 product CIRRUS CS4610		0x6001	CS4610 SoundFusion
-product CIRRUS CS4615		0x6004	CS4615
 product CIRRUS CS4280		0x6003	CS4280/46xx CrystalClear
+product CIRRUS CS4615		0x6004	CS4615
 product CIRRUS CS4281		0x6005	CS4281 CrystalClear
 
 /* Cisco products */
@@ -2518,6 +2510,14 @@ product CMDTECH 3132		0x3132	SiI3132 SATA
 product CMDTECH 3512		0x3512	SiI3512 SATA
 product CMDTECH 3531		0x3531	SiI3531 SATA
 
+/* C-Media Electronics */
+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 HSP56		0x0211	HSP56 AMR
+product CMI CMI8788		0x8788	CMI8788 HD Audio
+
 /* CNet produts */
 product CNET GIGACARD		0x434e	GigaCard
 
@@ -2584,10 +2584,10 @@ product CONEXANT RS7112		0x1803	RS7112
 product CONEXANT 56K_WINMODEM3	0x1804	56k Winmodem
 product CONEXANT SOFTK56_PCI	0x2443	SoftK56 PCI
 product CONEXANT HSF_56K_HSFI	0x2f00	HSF 56k HSFi
-product CONEXANT MUSYCC8478	0x8478	MUSYCC CN8478
-product CONEXANT MUSYCC8474	0x8474	MUSYCC CN8474
-product CONEXANT MUSYCC8472	0x8472	MUSYCC CN8472
 product CONEXANT MUSYCC8471	0x8471	MUSYCC CN8471
+product CONEXANT MUSYCC8472	0x8472	MUSYCC CN8472
+product CONEXANT MUSYCC8474	0x8474	MUSYCC CN8474
+product CONEXANT MUSYCC8478	0x8478	MUSYCC CN8478
 product CONEXANT CX2388X	0x8800	CX2388x
 product CONEXANT CX2388X_AUDIO	0x8801	CX2388x Audio
 product CONEXANT CX2388X_MPEG	0x8802	CX2388x MPEG
@@ -2659,9 +2659,9 @@ product DAVICOM DM9102		0x9102	DM9102
 product DAVICOM DM9132		0x9132	DM9132
 
 /* Decision Computer Inc */
-product DCI APCI2		0x0004	PCCOM 2-port
 product DCI APCI4		0x0001	PCCOM 4-port
 product DCI APCI8		0x0002	PCCOM 8-port
+product DCI APCI2		0x0004	PCCOM 2-port
 
 /* DEC products */
 product DEC 21050		0x0001	21050
@@ -2705,6 +2705,7 @@ product DELL DRAC_4		0x0011	DRAC 4
 product DELL DRAC_4_VUART	0x0012	DRAC 4 Virtual UART
 product DELL PERC_4EDI		0x0013	PERC 4e/Di
 product DELL DRAC_4_SMIC	0x0014	DRAC 4 SMIC
+product DELL PERC5		0x0015	PERC 5
 product DELL PERC_3DI_2_SUB	0x00cf	PERC 3/Di
 product DELL PERC_3SI_2_SUB	0x00d0	PERC 3/Si
 product DELL PERC_3DI_SUB2	0x00d1	PERC 3/Di
@@ -2712,7 +2713,6 @@ product DELL PERC_3DI_SUB3	0x00d9	PERC 3/Di
 product DELL PERC_3DI_3_SUB	0x0106	PERC 3/Di
 product DELL PERC_3DI_3_SUB2	0x011b	PERC 3/Di
 product DELL PERC_3DI_3_SUB3	0x0121	PERC 3/Di
-product DELL PERC5		0x0015	PERC 5
 
 /* Delta Electronics products */
 product DELTA RHINEII		0x1320	RhineII
@@ -2721,6 +2721,11 @@ product DELTA 8139		0x1360	8139
 /* Diamond products */
 product DIAMOND VIPER		0x9001	Viper/PCI
 
+/* Digi International */
+product DIGI NEO4		0x00b0	Neo-4
+product DIGI NEO8		0x00b1	Neo-8
+product DIGI NEO8_PCIE		0x00f0	Neo-8
+
 /* D-Link products */
 product DLINK DFE550TX		0x1002	DFE-550TX
 product DLINK DFE530TXPLUS	0x1300	DFE-530TX+
@@ -2739,6 +2744,9 @@ product DLINK DGE550T_B1	0x4b03	DGE-550T B1
 product DLINK DGE530T_A1	0x4c00	DGE-530T A1
 product	DLINK2 DFE530TXPLUS2	0x8139	DFE-530TX+
 
+/* Dolphin products */
+product DOLPHIN PCISCI		0x0658	PCI-SCI
+
 /* Distributed Processing Technology products */
 product DPT MEMCTLR		0x1012	Memory Control
 product DPT SC_RAID		0xa400	SmartCache/Raid
@@ -2746,9 +2754,6 @@ product DPT I960_PPB		0xa500	PCI-PCI
 product DPT RAID_I2O		0xa501	SmartRAID
 product DPT 2005S		0xa511	SmartRAID 2005S
 
-/* Dolphin products */
-product DOLPHIN PCISCI		0x0658	PCI-SCI
-
 /* DTC Technology Corp products */
 product DTCTECH DMX3194U	0x0002	DMX3194U
 
@@ -2757,11 +2762,11 @@ product DYNALINK IS64PH		0x1702	IS64PH ISDN
 
 /* Edimax products */
 product EDIMAX RT2860_1		0x7708	RT2860
-product EDIMAX RT2860_2		0x7728	RT2860
-product EDIMAX RT2860_3		0x7758	RT2860
 product EDIMAX RT2860_4		0x7727	RT2860
+product EDIMAX RT2860_2		0x7728	RT2860
 product EDIMAX RT2860_5		0x7738	RT2860
 product EDIMAX RT2860_6		0x7748	RT2860
+product EDIMAX RT2860_3		0x7758	RT2860
 product EDIMAX RT2860_7		0x7768	RT2860
 
 /* Efficient Networks products */
@@ -2837,6 +2842,22 @@ product ENSONIQ	AUDIOPCI97	0x1371	AudioPCI97
 product ENSONIQ AUDIOPCI	0x5000	AudioPCI
 product ENSONIQ CT5880		0x5880	CT5880
 
+/* Equinox Systems products */
+product EQUINOX SST64		0x0808	SST-64P
+product EQUINOX SST128		0x1010	SST-128P
+product EQUINOX SST16A		0x80c0	SST-16P
+product EQUINOX SST16B		0x80c4	SST-16P
+product EQUINOX SST16C		0x80c8	SST-16P
+product EQUINOX SST4		0x8888	SST-4p
+product EQUINOX SST8		0x9090	SST-8p
+
+/* Evans & Sutherland products */
+product ES FREEDOM		0x0001	Freedom GBus
+
+/* Essential Communications products */
+product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI
+product ESSENTIAL RR_GIGE	0x0005	RoadRunner Gig-E
+
 /* ESS Technology products */
 product ESSTECH	ES336H		0x0000	ES366H Modem
 product ESSTECH	MAESTROII	0x1968	Maestro II
@@ -2851,29 +2872,13 @@ product ESSTECH	ES336H_N	0x2808	ES366H Fax/Modem
 product ESSTECH SUPERLINK	0x2838	ES2838/2839 SuperLink Modem
 product ESSTECH 2898		0x2898	ES2898 Modem
 
-/* Essential Communications products */
-product ESSENTIAL RR_HIPPI	0x0001	RoadRunner HIPPI
-product ESSENTIAL RR_GIGE	0x0005	RoadRunner Gig-E
-
 /* Etron products */
 product ETRON EJ168_XHCI	0x7023	EJ168 xHCI
 product ETRON EJ188_XHCI	0x7052	EJ188 xHCI
 
-/* Evans & Sutherland products */
-product ES FREEDOM		0x0001	Freedom GBus
-
 /* Eumitcom Technology products */
 product EUMITCOM WL11000P	0x1100	WL11000P
 
-/* Equinox Systems products */
-product EQUINOX SST64		0x0808	SST-64P
-product EQUINOX SST128		0x1010	SST-128P
-product EQUINOX SST16A		0x80c0	SST-16P
-product EQUINOX SST16B		0x80c4	SST-16P
-product EQUINOX SST16C		0x80c8	SST-16P
-product EQUINOX SST4		0x8888	SST-4p
-product EQUINOX SST8		0x9090	SST-8p
-
 /* Exar products */
 product EXAR XR17C152		0x0152	XR17C152
 product EXAR XR17C154		0x0154	XR17C154
@@ -2916,23 +2921,52 @@ product FUSIONIO IOXTREME_PRO	0x1007	ioXtreme Pro
 /* Future Domain products */
 product FUTUREDOMAIN TMC_18C30	0x0000	TMC-18C30
 
+/* Guillemot products */
+product GEMTEK PR103		0x1001	PR103
+
 /* Global Sun Technology products */
 product GLOBALSUN GL24110P03	0x1100	GL24110P03
 product GLOBALSUN GL24110P	0x1101	GL24110P
 product GLOBALSUN GL24110P02	0x1102	GL24110P02
+product GLOBALSUN 8031		0x1103	8031
 
 /* Globespan products */
 product GLOBESPAN G7370		0xd002	Pulsar G7370 ADSL
 
-/* Guillemot products */
-product GEMTEK PR103		0x1001	PR103
-
 /* Hauppauge Computer Works */
 product HAUPPAUGE WINTV		0x13eb	WinTV
 
 /* Hawking products */
 product HAWKING PN672TX		0xab08	PN672TX
 
+/* Hifn products */
+product HIFN 7751		0x0005	7751
+product HIFN 6500		0x0006	6500
+product HIFN 7811		0x0007	7811
+product HIFN 7951		0x0012	7951
+product HIFN 78XX		0x0014	7814/7851/7854
+product HIFN 8065		0x0016	8065
+product HIFN 8165		0x0017	8165
+product HIFN 8154		0x0018	8154
+product HIFN 7956		0x001d	7956
+product HIFN 7955		0x0020	7955/7954
+
+/* Hint products */
+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
+
+/* Hitachi products */
+product HITACHI SWC		0x0101	MSVCC01 Video Capture
+product HITACHI SH7751		0x3505	SH7751 PCI
+product HITACHI SH7751R		0x350e	SH7751R PCI
+
+/* Hitachi Micro products */
+product HITACHI_M ISP2100	0x2100	ISP2100
+
 /* Hewlett-Packard products */
 product HP VISUALIZE_EG		0x1005	Visualize EG
 product HP VISUALIZE_FX6	0x1006	Visualize FX6
@@ -3010,10 +3044,10 @@ product HP HPSAP712M		0x324a	Smart Array P712m
 product HP HPSAP711M		0x324b	Smart Array P711m
 product HP USB			0x3300	USB
 product HP ILO3_SERIAL		0x3301	iLO3 Serial
+product HP IPMI			0x3302	IPMI
 product HP ILO3_SLAVE		0x3306	iLO3 Slave
 product HP ILO3_MGMT		0x3307	iLO3 Management
 product HP ILO3_WATCHDOG	0x3308	iLO3 Watchdog
-product HP IPMI			0x3302	IPMI
 product HP HPSAP222		0x3350	Smart Array P222
 product HP HPSAP420		0x3351	Smart Array P420
 product HP HPSAP421		0x3352	Smart Array P421
@@ -3022,34 +3056,6 @@ product HP HPSAP420I		0x3354	Smart Array P420i
 product HP HPSAP220I		0x3355	Smart Array P220i
 product HP HPSAP721M		0x3356	Smart Array P721m
 
-/* Hifn products */
-product HIFN 7751		0x0005	7751
-product HIFN 6500		0x0006	6500
-product HIFN 7811		0x0007	7811
-product HIFN 7951		0x0012	7951
-product HIFN 78XX		0x0014	7814/7851/7854
-product HIFN 8065		0x0016	8065
-product HIFN 8165		0x0017	8165
-product HIFN 8154		0x0018	8154
-product HIFN 7956		0x001d	7956
-product HIFN 7955		0x0020	7955/7954
-
-/* Hint products */
-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
-
-/* Hitachi products */
-product HITACHI SWC		0x0101	MSVCC01 Video Capture
-product HITACHI SH7751		0x3505	SH7751 PCI
-product HITACHI SH7751R		0x350e	SH7751R PCI
-
-/* Hitachi Micro products */
-product HITACHI_M ISP2100	0x2100	ISP2100
-
 /* Huawei products */
 product HUAWEI HIBMC_VGA	0x1711	HiBMC VGA
 
@@ -3092,6 +3098,15 @@ product IDT 89HPES64H16G2	0x8077	89HPES64H16G2
 product IDT 89HPES48H12G2	0x807a	89HPES48H12G2
 product IDT 89H64H16G3		0x80bf	89H64H16G3
 
+/* Integrated Micro Solutions products */
+product IMS 5026		0x5026	5026
+product IMS 5027		0x5027	5027
+product IMS 5028		0x5028	5028
+product IMS 8849		0x8849	8849
+product IMS 8853		0x8853	8853
+product IMS TT128		0x9128	Twin Turbo 128
+product IMS TT3D		0x9135	Twin Turbo 3D
+
 /* Industrial Computer Source */
 product INDCOMPSRC WDT50X	0x22c0	WDT 50x Watchdog Timer
 
@@ -3111,15 +3126,6 @@ product INNOTEK VBGS		0xcafe	VirtualBox Guest Service
 product INPROCOMM IPN2120	0x2120	IPN2120
 product INPROCOMM IPN2220	0x2220	IPN2220
 
-/* Integrated Micro Solutions products */
-product IMS 5026		0x5026	5026
-product IMS 5027		0x5027	5027
-product IMS 5028		0x5028	5028
-product IMS 8849		0x8849	8849
-product IMS 8853		0x8853	8853
-product IMS TT128		0x9128	Twin Turbo 128
-product IMS TT3D		0x9135	Twin Turbo 3D
-
 /* Intel products */
 product INTEL EESISA		0x0008	EES ISA
 product INTEL 21145		0x0039	21145
@@ -3218,12 +3224,12 @@ product INTEL 82426EX		0x0486	82426EX ISA
 product INTEL PCMC		0x04a3	82434LX/NX
 product INTEL GDT_RAID1		0x0600	GDT RAID
 product INTEL GDT_RAID2		0x061f	GDT RAID
-product INTEL WL_6235_1		0x088e	Centrino Advanced-N 6235
-product INTEL WL_6235_2		0x088f	Centrino Advanced-N 6235
 product INTEL WL_6150_1		0x0885	Centrino Wireless-N 6150
 product INTEL WL_6150_2		0x0886	Centrino Wireless-N 6150
 product INTEL WL_2230_1		0x0887	Centrino Wireless-N 2230
 product INTEL WL_2230_2		0x0888	Centrino Wireless-N 2230
+product INTEL WL_6235_1		0x088e	Centrino Advanced-N 6235
+product INTEL WL_6235_2		0x088f	Centrino Advanced-N 6235
 product INTEL WL_2200_1		0x0890	Centrino Wireless-N 2200
 product INTEL WL_2200_2		0x0891	Centrino Wireless-N 2200
 product INTEL WL_135_1		0x0892	Centrino Wireless-N 135
@@ -3238,12 +3244,12 @@ product INTEL WL_7260_1		0x08b1	Dual Band Wireless AC 7260
 product INTEL WL_7260_2		0x08b2	Dual Band Wireless AC 7260
 product INTEL WL_3160_1		0x08b3	Dual Band Wireless AC 3160
 product INTEL WL_3160_2		0x08b4	Dual Band Wireless AC 3160
+product INTEL NVME		0x0953	NVMe
 product INTEL WL_7265_1		0x095a	Dual Band Wireless AC 7265
 product INTEL WL_7265_2		0x095b	Dual Band Wireless AC 7265
 product INTEL 80960RP		0x0960	i960 RP
 product INTEL 80960RM		0x0962	i960 RM
 product INTEL 80960RN		0x0964	i960 RN
-product INTEL NVME		0x0953	NVMe
 product INTEL CORE4G_D_ULT_GT1	0x0a02	HD Graphics
 product INTEL CORE4G_THERM	0x0a03	Core 4G Thermal
 product INTEL CORE4G_HB_1	0x0a04	Core 4G Host
@@ -3642,8 +3648,8 @@ product INTEL 82580_FIBER	0x150f	82580
 product INTEL 82580_SERDES	0x1510	82580
 product INTEL 82580_SGMII	0x1511	82580
 product INTEL 82524EF		0x1513	82524EF Thunderbolt
-product INTEL 82580_COPPER_DUAL	0x1516	82580
 product INTEL 82599_KX4_MEZZ	0x1514	82599
+product INTEL 82580_COPPER_DUAL	0x1516	82580
 product INTEL 82599_KR		0x1517	82599
 product INTEL 82576_NS_SERDES	0x1518	82576NS
 product INTEL 82599_T3_LOM	0x151c	82599 T3
@@ -4290,8 +4296,6 @@ product INTEL 82801H_SATA_2	0x2825	82801H SATA
 product INTEL 82801HBM_SATA	0x2828	82801HBM SATA
 product INTEL 82801HBM_AHCI	0x2829	82801HBM AHCI
 product INTEL 82801HBM_RAID	0x282a	82801HBM RAID
-product INTEL 82801H_SMB	0x283e	82801H SMBus
-product INTEL 82801H_DMI	0x284f	82801H DMI-PCI
 product INTEL 82801H_UHCI_1	0x2830	82801H USB
 product INTEL 82801H_UHCI_2	0x2831	82801H USB
 product INTEL 82801H_UHCI_3	0x2832	82801H USB
@@ -4300,6 +4304,7 @@ product INTEL 82801H_UHCI_4	0x2834	82801H USB
 product INTEL 82801H_UHCI_5	0x2835	82801H USB
 product INTEL 82801H_EHCI_1	0x2836	82801H USB
 product INTEL 82801H_EHCI_2	0x283a	82801H USB
+product INTEL 82801H_SMB	0x283e	82801H SMBus
 product INTEL 82801H_PCIE_1	0x283f	82801H PCIE
 product INTEL 82801H_PCIE_2	0x2841	82801H PCIE
 product INTEL 82801H_PCIE_3	0x2843	82801H PCIE
@@ -4410,8 +4415,8 @@ product INTEL 82GM965_HB	0x2a00	GM965 Host
 product INTEL 82GM965_PCIE	0x2a01	GM965 PCIE
 product INTEL 82GM965_IGD_1	0x2a02	GM965 Video
 product INTEL 82GM965_IGD_2	0x2a03	GM965 Video
-product INTEL 82GM965_KT	0x2a07	GM965 KT
 product INTEL 82GM965_PT_IDER	0x2a06	GM965 PT IDER
+product INTEL 82GM965_KT	0x2a07	GM965 KT
 product INTEL 82GME965_HB	0x2a10	GME965 Host
 product INTEL 82GME965_PCIE	0x2a11	GME965 PCIE
 product INTEL 82GME965_IGD_1	0x2a12	GME965 Video
@@ -4428,7 +4433,6 @@ product INTEL 82GM45_HECI_1	0x2a44	GM45 HECI
 product INTEL 82GM45_HECI_2	0x2a45	GM45 HECI
 product INTEL 82GM45_PT_IDER	0x2a46	GM45 PT IDER
 product INTEL 82GM45_KT		0x2a47	GM45 KT
-product INTEL 4SERIES_IGD	0x2e02	4 Series Video
 product INTEL NCORE_QP_REG_1	0x2c61	QuickPath
 product INTEL NCORE_QP_REG_2	0x2c62	QuickPath
 product INTEL NCORE_QP_SAD	0x2d01	QuickPath
@@ -4436,6 +4440,7 @@ product INTEL NCORE_QPI_LINK_0	0x2d10	QPI Link
 product INTEL NCORE_QPI_PHYS_0	0x2d11	QPI Physical
 product INTEL NCORE_RESERVED_1	0x2d12	Reserved
 product INTEL NCORE_RESERVED_2	0x2d13	Reserved
+product INTEL 4SERIES_IGD	0x2e02	4 Series Video
 product INTEL 82Q45_HB		0x2e10	Q45 Host
 product INTEL 82Q45_PCIE	0x2e11	Q45 PCIE
 product INTEL 82Q45_IGD_1	0x2e12	Q45 Video
@@ -4666,8 +4671,8 @@ product INTEL 7300_SNOOP	0x360d	7300 Snoop Filter
 product INTEL 7300_MISC		0x360e	7300 Misc
 product INTEL 7300_FBD_0	0x360f	7300 FBD
 product INTEL 7300_FBD_1	0x3610	7300 FBD
-product INTEL X722_10G_KX	0x37ce	X722 KX
 product INTEL X722_VF		0x37cd	X722 VF
+product INTEL X722_10G_KX	0x37ce	X722 KX
 product INTEL X722_10G_QSFP	0x37cf	X722 QSFP+
 product INTEL X722_10G_SFP_1	0x37d0	X722 SFP+
 product INTEL X722_1G		0x37d1	X722 1GbE
@@ -5043,13 +5048,13 @@ product INTEL E5V4_DDRIO_2	0x6f6f	E5 v4 DDRIO
 product INTEL XEOND_MEM_0	0x6f71	Xeon-D Memory
 product INTEL XEOND_QPI_R3_2	0x6f76	Xeon-D QPI Debug
 product INTEL XEOND_UBOX_2	0x6f7d	Xeon-D Ubox
+product INTEL XEOND_QPI_R3_3	0x6f81	Xeon-D QPI Link
 product INTEL XEOND_PCU_0	0x6f88	Xeon-D PCU
 product INTEL XEOND_PCU_1	0x6f8a	Xeon-D PCU
 product INTEL XEOND_PCU_2	0x6f98	Xeon-D PCU
 product INTEL XEOND_PCU_3	0x6f99	Xeon-D PCU
 product INTEL XEOND_PCU_4	0x6f9a	Xeon-D PCU
 product INTEL XEOND_PCU_5	0x6f9c	Xeon-D PCU
-product INTEL XEOND_QPI_R3_3	0x6f81	Xeon-D QPI Link
 product INTEL XEOND_HA_1	0x6fa0	Xeon-D Home Agent
 product INTEL XEOND_MEM_1	0x6fa8	Xeon-D Memory
 product INTEL XEOND_MEM_2	0x6faa	Xeon-D Memory
@@ -5313,15 +5318,15 @@ product INTEL 9SERIES_LP_PCIE_3	0x9c94	9 Series PCIE
 product INTEL 9SERIES_LP_PCIE_4	0x9c96	9 Series PCIE
 product INTEL 9SERIES_LP_PCIE_5	0x9c98	9 Series PCIE
 product INTEL 9SERIES_LP_PCIE_6	0x9c9a	9 Series PCIE
-product INTEL 9SERIES_LP_MEI_1	0x9cba	9 Series MEI
-product INTEL 9SERIES_LP_MEI_2	0x9cbb	9 Series MEI
-product INTEL 9SERIES_LP_IDER	0x9cbc	9 Series IDER
-product INTEL 9SERIES_LP_KT	0x9cbd	9 Series KT
 product INTEL 9SERIES_LP_HDA	0x9ca0	9 Series HD Audio
 product INTEL 9SERIES_LP_SMB	0x9ca2	9 Series SMBus
 product INTEL 9SERIES_LP_THERM	0x9ca4	9 Series Thermal
 product INTEL 9SERIES_LP_EHCI	0x9ca6	9 Series USB
 product INTEL 9SERIES_LP_XHCI	0x9cb1	9 Series xHCI
+product INTEL 9SERIES_LP_MEI_1	0x9cba	9 Series MEI
+product INTEL 9SERIES_LP_MEI_2	0x9cbb	9 Series MEI
+product INTEL 9SERIES_LP_IDER	0x9cbc	9 Series IDER
+product INTEL 9SERIES_LP_KT	0x9cbd	9 Series KT
 product INTEL 9SERIES_LP_LPC_1	0x9cc3	9 Series LPC
 product INTEL 9SERIES_LP_LPC_2	0x9cc5	9 Series LPC
 product INTEL 9SERIES_LP_LPC_3	0x9cc7	9 Series LPC
@@ -5633,10 +5638,6 @@ product INVERTEX AEON		0x0005	AEON
 /* IO Data Device Inc products */
 product IODATA GV_BCTV3		0x4020	GV-BCTV3
 
-/* I. T. T. products */
-product ITT AGX016		0x0001	AGX016
-product ITT ITT3204		0x0002	ITT3204 MPEG Decoder
-
 /* ITExpress */
 product ITEXPRESS IT8211F	0x8211	IT8211F
 product ITEXPRESS IT8212F	0x8212	IT8212F
@@ -5646,6 +5647,10 @@ product ITEXPRESS IT8888F_ISA	0x8888	IT8888F ISA
 product ITEXPRESS IT8892E	0x8892	IT8892E PCIE-PCI
 product ITEXPRESS IT8893E	0x8893	IT8893E PCIE-PCI
 
+/* ITT products */
+product ITT AGX016		0x0001	AGX016
+product ITT ITT3204		0x0002	ITT3204 MPEG Decoder
+
 /* JMicron */
 product JMICRON JMC250		0x0250	JMC250
 product JMICRON JMC260		0x0260	JMC260
@@ -5673,13 +5678,6 @@ product JMICRON XD_2		0x2394	xD
 /* KTI */
 product KTI KTIE		0x3000	KTI
 
-/* LAN Media Corporation */
-product LMC HSSI		0x0003	HSSI
-product LMC DS3			0x0004	DS3
-product LMC SSI			0x0005	SSI
-product LMC DS1			0x0006	DS1
-product LMC HSSIC		0x0007	HSSIc
-
 /* Lanergy */
 product LANERGY APPIAN_PCI_LITE	0x0001	Appian Lite
 
@@ -5721,8 +5719,12 @@ product LITEON PNIC		0x0002	PNIC
 product LITEON PNICII		0xc115	PNIC-II
 product LITEON2 CB1		0x5100	CB1 NVMe
 
-/* Longshine products */
-product GLOBALSUN 8031		0x1103	8031
+/* LAN Media Corporation */
+product LMC HSSI		0x0003	HSSI
+product LMC DS3			0x0004	DS3
+product LMC SSI			0x0005	SSI
+product LMC DS1			0x0006	DS1
+product LMC HSSIC		0x0007	HSSIc
 
 /* Lucent products */
 product LUCENT LTMODEM		0x0440	K56flex DSVD LTMODEM
@@ -5752,8 +5754,8 @@ product LUCENT LTMODEM_0458	0x0458	LTMODEM
 product LUCENT LTMODEM_0459	0x0459	LTMODEM
 product LUCENT LTMODEM_045A	0x045a	LTMODEM
 product LUCENT LTMODEM_045C	0x045c	LTMODEM
-product LUCENT LTMODEM_048C	0x048c	LTMODEM
 product LUCENT VENUSMODEM	0x0480	Venus Modem
+product LUCENT LTMODEM_048C	0x048c	LTMODEM
 product LUCENT USBHC		0x5801	USB
 product LUCENT USBHC2		0x5802	USB 2-port
 product LUCENT USBQBUS		0x5803	USB QuadraBus
@@ -5879,16 +5881,12 @@ 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_P650_PCIE	0x2538	MGA P650 PCIe
-product MATROX G200ER		0x0534	MGA G200eR
 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
 product MATROX MARV_G200_SD	0xff04	MGA Marvel G200 SD
 
-/* Brainboxes */
-product	BRAINBOXES IS200_BB16PCI958	0x0d80	IS200 BB16PCI958
-
 /* Meinberg Funkuhren */
 product MEINBERG PCI32		0x0101	PCI32
 product MEINBERG PCI509		0x0102	PCI509
@@ -5917,17 +5915,14 @@ product MENTOR PCI0661		0x0661	PCI-PCI
 product MICREL KSZ8841		0x8841	KSZ8841
 product MICREL KSZ8842		0x8842	KSZ8842
 
-/* Micro Star International products */
-product MSI RT3090		0x891a	RT3090
-
 /* Microsoft products */
 product MICROSOFT MN120		0x0001	MN-120
 product MICROSOFT MN130		0x0002	MN-130
 product MICROSOFT VGA		0x5353	VGA
 
 /* Miro Computer Products AG */
-product MIRO 2IVDC		0x5607	2IVDC-PCX1
 product MIRO DC20		0x5601	MiroVIDEO DC20
+product MIRO 2IVDC		0x5607	2IVDC-PCX1
 product MIRO MEDIA3D		0x5631	Media 3D
 product MIRO DC10		0x6057	MiroVIDEO DC10/DC20
 
@@ -5941,21 +5936,27 @@ product MOSCHIP MCS9865		0x6873	Serial MCS9865
 /* Motorola products */
 product MOT MPC105		0x0001	MPC105 PCI
 product MOT MPC106		0x0002	MPC106 PCI
-product MOT SM56		0x5600	SM56
 product MOT RAVEN		0x4801	Raven PCI
+product MOT SM56		0x5600	SM56
 
 /* Moxa */
-product MOXA CP114		0x1141	CP-114
 product MOXA C104H		0x1040	C104H
 product MOXA CP104UL		0x1041	CP-104UL
 product MOXA CP104JU		0x1042	CP-104JU
 product MOXA CP104EL		0x1043	CP-104EL
+product MOXA CP114		0x1141	CP-114
 product MOXA C168H		0x1680	C168H
 product MOXA CP168U		0x1681  CP-168U
 
 /* Mesa Ridge Technologies (MAGMA) */
 product MRTMAGMA DMA4		0x0011	DMA4 serial
 
+/* Micro Star International products */
+product MSI RT3090		0x891a	RT3090
+
+/* Mutech products */
+product MUTECH MV1000		0x0001	MV1000
+
 /* Mylex products */
 product MYLEX 960P_V2		0x0001	DAC960P V2 RAID
 product MYLEX 960P_V3		0x0002	DAC960P V3 RAID
@@ -5974,74 +5975,24 @@ product MYSON MTD800		0x0800	MTD800
 product MYSON MTD803		0x0803	MTD803
 product MYSON MTD891		0x0891	MTD891
 
-/* Mutech products */
-product MUTECH MV1000		0x0001	MV1000
-
-/* Nanjing QinHeng Electronics products */
-product WCH CH352		0x3253	CH352
-product WCH2 CH351		0x2273	CH351
-product WCH2 CH382_1		0x3253	CH382
-product WCH2 CH382_2		0x3250	CH382
-
-/* TXIC */
-product	TXIC TX382B		0x3273	TX382B
+/* National Instruments */
+product NATINST PCIGPIB		0xc801	PCI-GPIB
 
 /* National Datacomm Corp products */
 product NDC NCP130		0x0130	NCP130
 product NDC NCP130A2		0x0131	NCP130A2
 
-/* National Instruments */
-product NATINST PCIGPIB		0xc801	PCI-GPIB
-
-/* NetChip Technology products */
-product NETCHIP NET2282		0x2282	NET2282 USB
-
-/* NetXen Inc products */
-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
-product NETXEN NXB_HMEZ_2	0x0025	HMEZ 10GbE Mgmt
-product NETXEN NX3031		0x0100	NX3031
-
-/* National Semiconductor products */
-product NS DP83810		0x0001	DP83810
-product NS PC87415		0x0002	PC87415 IDE
-product NS PC87560		0x000e	87560 Legacy I/O
-product NS USB			0x0012	USB
-product NS DP83815		0x0020	DP83815
-product NS DP83820		0x0022	DP83820
-product NS CS5535_HB		0x0028	CS5535 Host
-product NS CS5535_ISA		0x002b	CS5535 ISA
-product NS CS5535_IDE		0x002d	CS5535 IDE
-product NS CS5535_AUDIO		0x002e	CS5535 AUDIO
-product NS CS5535_USB		0x002f	CS5535 USB
-product NS CS5535_VIDEO		0x0030	CS5535 VIDEO
-product NS SATURN		0x0035	Saturn
-product NS SCX200_ISA		0x0500	SCx200 ISA
-product NS SCX200_SMI		0x0501	SCx200 SMI
-product NS SCX200_IDE		0x0502	SCx200 IDE
-product NS SCX200_AUDIO		0x0503	SCx200 AUDIO
-product NS SCX200_VIDEO		0x0504	SCx200 VIDEO
-product NS SCX200_XBUS		0x0505	SCx200 X-BUS
-product NS SC1100_ISA		0x0510	SC1100 ISA
-product NS SC1100_SMI		0x0511	SC1100 SMI
-product NS SC1100_XBUS		0x0515	SC1100 X-Bus
-product NS NS87410		0xd001	NS87410
-
 /* NEC */
 product NEC USB			0x0035	USB
 product NEC POWERVR2		0x0046	PowerVR PCX2
 product NEC MARTH		0x0074	I/O
 product NEC PKUG		0x007d	I/O
-product NEC UPD72874		0x00f2	Firewire
 product NEC USB2		0x00e0	USB
+product NEC UPD72874		0x00f2	Firewire
 product NEC UPD720400		0x0125	PCIE-PCIX
 product NEC UPD720200		0x0194	xHCI
-product NEC VERSAMAESTRO	0x8058	Versa Maestro
 product NEC VERSAPRONXVA26D	0x803c	Versa Va26D Maestro
+product NEC VERSAMAESTRO	0x8058	Versa Maestro
 
 /* NeoMagic */
 product NEOMAGIC NM2070		0x0001	Magicgraph NM2070
@@ -6050,11 +6001,14 @@ product NEOMAGIC 128ZV		0x0003	Magicgraph 128ZV
 product NEOMAGIC NM2160		0x0004	Magicgraph NM2160
 product NEOMAGIC NM2200		0x0005	Magicgraph NM2200
 product NEOMAGIC NM2360		0x0006	Magicgraph NM2360
-product NEOMAGIC NM2230		0x0025	MagicMedia 256AV+
 product NEOMAGIC NM256XLP	0x0016	MagicMedia 256XL+
+product NEOMAGIC NM2230		0x0025	MagicMedia 256AV+
 product NEOMAGIC NM256AV	0x8005	MagicMedia 256AV
 product NEOMAGIC NM256ZX	0x8006	MagicMedia 256ZX
 
+/* NetChip Technology products */
+product NETCHIP NET2282		0x2282	NET2282 USB
+
 /* Neterion products */
 product NETERION XFRAME		0x5831	Xframe
 product NETERION XFRAME_2	0x5832	Xframe II
@@ -6073,189 +6027,30 @@ product NETMOS NM9865		0x9865	Nm9865
 product NETMOS NM9901		0x9901	Nm9901
 product NETMOS NM9922		0x9922	Nm9922
 
-/* Network Security Technologies */
-product NETSEC 7751		0x7751	7751
-
-/* C-Media Electronics */
-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 HSP56		0x0211	HSP56 AMR
-product CMI CMI8788		0x8788	CMI8788 HD Audio
-
 /* Netoctave */
 product NETOCTAVE NSP2K		0x0100	NSP2K
 
+/* Network Security Technologies */
+product NETSEC 7751		0x7751	7751
+
 /* NetVin */
 product NETVIN NV5000		0x5000	NetVin 5000
 
+/* NetXen Inc products */
+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
+product NETXEN NXB_HMEZ_2	0x0025	HMEZ 10GbE Mgmt
+product NETXEN NX3031		0x0100	NX3031
+
 /* Newbridge / Tundra / IDT products */
 product NEWBRIDGE CA91CX42	0x0000	Universe VME
 product NEWBRIDGE TSI381	0x8111	Tsi381 PCIE-PCI
 product NEWBRIDGE PEB383	0x8113	PEB383 PCIE-PCI
 
-/* SIIG products */
-product SIIG	1000		0x1000	I/O
-product SIIG	1001		0x1001	I/O
-product SIIG	1002		0x1002	I/O
-product SIIG	1010		0x1010	I/O
-product SIIG	1011		0x1011	I/O
-product SIIG	1012		0x1012	I/O
-product SIIG	1020		0x1020	I/O
-product SIIG	1021		0x1021	I/O
-product SIIG	1030		0x1030	I/O
-product SIIG	1031		0x1031	I/O
-product SIIG	1032		0x1032	I/O
-product SIIG	1034		0x1034	I/O
-product SIIG	1035		0x1035	I/O
-product SIIG	1036		0x1036	I/O
-product SIIG	1050		0x1050	I/O
-product SIIG	1051		0x1051	I/O
-product SIIG	1052		0x1052	I/O
-product SIIG	2000		0x2000	I/O
-product SIIG	2001		0x2001	I/O
-product SIIG	2002		0x2002	I/O
-product SIIG	2010		0x2010	I/O
-product SIIG	2011		0x2011	I/O
-product SIIG	2012		0x2012	I/O
-product SIIG	2020		0x2020	I/O
-product SIIG	2021		0x2021	I/O
-product SIIG	2030		0x2030	I/O
-product SIIG	2031		0x2031	I/O
-product SIIG	2032		0x2032	I/O
-product SIIG	2040		0x2040	I/O
-product SIIG	2041		0x2041	I/O
-product SIIG	2042		0x2042	I/O
-product SIIG	2050		0x2050	I/O
-product SIIG	2051		0x2051	I/O
-product SIIG	2052		0x2052	I/O
-product SIIG	2060		0x2060	I/O
-product SIIG	2061		0x2061	I/O
-product SIIG	2062		0x2062	I/O
-product SIIG	2081		0x2081	I/O
-product SIIG	2082		0x2082	I/O
-
-/* Solarflare products */
-product SOLARFLARE FALCON_P	0x0703	Falcon P
-product SOLARFLARE FALCON_S	0x6703	Falcon S
-product SOLARFLARE EF1002	0xc101	EF1002
-
-/* NCR/Symbios Logic/LSI products */
-product SYMBIOS 810		0x0001	53c810
-product SYMBIOS 820		0x0002	53c820
-product SYMBIOS 825		0x0003	53c825
-product SYMBIOS 815		0x0004	53c815
-product SYMBIOS 810AP		0x0005	53c810AP
-product SYMBIOS 860		0x0006	53c860
-product SYMBIOS	1510D		0x000a	53c1510D
-product SYMBIOS	896		0x000b	53c896
-product SYMBIOS	895		0x000c	53c895
-product SYMBIOS	885		0x000d	53c885
-product SYMBIOS 875		0x000f	53c875
-product SYMBIOS	1510		0x0010	53c1510
-product SYMBIOS	895A		0x0012	53c895A
-product SYMBIOS MEGARAID_3516	0x0014	MegaRAID SAS3516
-product SYMBIOS MEGARAID_3416	0x0015	MegaRAID SAS3416
-product SYMBIOS MEGARAID_3508	0x0016	MegaRAID SAS3508
-product SYMBIOS MEGARAID_3408	0x0017	MegaRAID SAS3408
-product SYMBIOS MEGARAID_3504	0x001b	MegaRAID SAS3504
-product SYMBIOS MEGARAID_3404	0x001c	MegaRAID SAS3404
-product SYMBIOS 1010		0x0020	53c1010-33
-product SYMBIOS 1010_2		0x0021	53c1010-66
-product SYMBIOS 1030		0x0030	53c1030
-product SYMBIOS 1030ZC		0x0031	53c1030ZC
-product SYMBIOS 1030_1035	0x0032	53c1035
-product SYMBIOS 1030ZC_1035	0x0033	53c1035
-product SYMBIOS 1035		0x0040	53c1035
-product SYMBIOS 1035ZC		0x0041	53c1035ZC
-product SYMBIOS SAS1064		0x0050	SAS1064
-product SYMBIOS SAS1068		0x0054	SAS1068
-product SYMBIOS SAS1068_2	0x0055	SAS1068
-product SYMBIOS SAS1064E	0x0056	SAS1064E
-product SYMBIOS SAS1064E_2	0x0057	SAS1064E
-product SYMBIOS SAS1068E	0x0058	SAS1068E
-product SYMBIOS SAS1068E_2	0x0059	SAS1068E
-product SYMBIOS SAS1066E	0x005a	SAS1066E
-product SYMBIOS MEGARAID_2208	0x005b	MegaRAID SAS2208
-product SYMBIOS SAS1064A	0x005c	SAS1064A
-product SYMBIOS MEGARAID_3108	0x005d	MegaRAID SAS3108
-product SYMBIOS SAS1066		0x005e	SAS1066
-product SYMBIOS MEGARAID_3008	0x005f	MegaRAID SAS3008
-product SYMBIOS SAS1078		0x0060	SAS1078
-product SYMBIOS SAS1078_PCIE	0x0062	SAS1078
-product SYMBIOS SAS2116_1	0x0064	SAS2116
-product SYMBIOS SAS2116_2	0x0065	SAS2116
-product SYMBIOS SAS2308_3	0x006e	SAS2308
-product SYMBIOS SAS2004		0x0070	SAS2004
-product SYMBIOS SAS2008		0x0072	SAS2008
-product SYMBIOS SAS2008_1	0x0073	MegaRAID SAS2008
-product SYMBIOS SAS2108_3	0x0074	SAS2108
-product SYMBIOS SAS2108_4	0x0076	SAS2108
-product SYMBIOS SAS2108_5	0x0077	SAS2108
-product SYMBIOS SAS2108_1	0x0078	MegaRAID SAS2108 CRYPTO GEN2
-product SYMBIOS SAS2108_2	0x0079	MegaRAID SAS2108 GEN2
-product SYMBIOS SAS1078DE	0x007c	SAS1078DE
-product SYMBIOS SSS6200		0x007e	SSS6200
-product SYMBIOS SAS2208_1	0x0080	SAS2208
-product SYMBIOS SAS2208_2	0x0081	SAS2208
-product SYMBIOS SAS2208_3	0x0082	SAS2208
-product SYMBIOS SAS2208_4	0x0083	SAS2208
-product SYMBIOS SAS2208_5	0x0084	SAS2208
-product SYMBIOS SAS2208_6	0x0085	SAS2208
-product SYMBIOS SAS2308_1	0x0086	SAS2308
-product SYMBIOS SAS2308_2	0x0087	SAS2308
-product SYMBIOS 875J		0x008f	53c875J
-product SYMBIOS SAS3108_1	0x0090	SAS3108
-product SYMBIOS SAS3108_2	0x0091	SAS3108
-product SYMBIOS SAS3108_3	0x0094	SAS3108
-product SYMBIOS SAS3108_4	0x0095	SAS3108
-product SYMBIOS SAS3004		0x0096	SAS3004
-product SYMBIOS SAS3008		0x0097	SAS3008
-product SYMBIOS SAS3516		0x00aa	SAS3516
-product SYMBIOS SAS3516_1	0x00ab	SAS3516
-product SYMBIOS SAS3416		0x00ac	SAS3416
-product SYMBIOS SAS3508		0x00ad	SAS3508
-product SYMBIOS SAS3508_1	0x00ae	SAS3508
-product SYMBIOS SAS3408		0x00af	SAS3408
-product SYMBIOS MEGARAID_320	0x0407	MegaRAID 320
-product SYMBIOS MEGARAID_3202E	0x0408	MegaRAID 320-2E
-product SYMBIOS MEGARAID_SATA	0x0409	MegaRAID SATA 4x/8x
-product SYMBIOS MEGARAID_SAS	0x0411	MegaRAID SAS 1064R
-product SYMBIOS MEGARAID_VERDE_ZCR 0x0413 MegaRAID Verde ZCR
-product SYMBIOS FC909		0x0620	FC909
-product SYMBIOS FC909A		0x0621	FC909A
-product SYMBIOS FC929		0x0622	FC929
-product SYMBIOS FC929_1		0x0623	FC929
-product SYMBIOS FC919		0x0624	FC919
-product SYMBIOS FC919_1		0x0625	FC919
-product SYMBIOS FC929X		0x0626	FC929X
-product SYMBIOS FC919X		0x0628	FC919X
-product SYMBIOS FC949X		0x0640	FC949X
-product SYMBIOS FC939X		0x0642	FC939X
-product SYMBIOS FC949E		0x0646	FC949E
-product SYMBIOS YELLOWFIN_1	0x0701	Yellowfin
-product SYMBIOS YELLOWFIN_2	0x0702	Yellowfin
-product SYMBIOS 61C102		0x0901	61C102
-product SYMBIOS 63C815		0x1000	63C815
-product SYMBIOS 1030R		0x1030	53c1030R
-product SYMBIOS MEGARAID	0x1960	MegaRAID
-
-/* Packet Engines products */
-product SYMBIOS PE_GNIC		0x0702	Packet Engines G-NIC
-
-/* Pericom products */
-product PERICOM PI7C21P100	0x01a7	PI7C21P100 PCIX-PCIX
-product PERICOM PI7C9X2G608GP	0x2608	PI7C9X2G608GP PCIE
-product PERICOM PPB_1		0x8140	PCI-PCI
-product PERICOM PPB_2		0x8150	PCI-PCI
-product PERICOM PI7C9X111SL	0xe111	PI7C9X111SL PCI
-product PERICOM PI7C9X130	0xe130	PI7C9X130 PCIE-PCIX
-
-/* Planex products */
-product PLANEX FNW_3603_TX	0xab06	FNW-3603-TX
-product PLANEX FNW_3800_TX	0xab07	FNW-3800-TX
-
 /* NexGen products */
 product NEXGEN NX82C501		0x4e78	NX82C501 PCI
 
@@ -6266,6 +6061,31 @@ product NKK NDR4600		0xa001	NDR4600 PCI
 product NORTEL BS21		0x1211	BS21
 product NORTEL 211818A		0x8030	E-mobility
 
+/* National Semiconductor products */
+product NS DP83810		0x0001	DP83810
+product NS PC87415		0x0002	PC87415 IDE
+product NS PC87560		0x000e	87560 Legacy I/O
+product NS USB			0x0012	USB
+product NS DP83815		0x0020	DP83815
+product NS DP83820		0x0022	DP83820
+product NS CS5535_HB		0x0028	CS5535 Host
+product NS CS5535_ISA		0x002b	CS5535 ISA
+product NS CS5535_IDE		0x002d	CS5535 IDE
+product NS CS5535_AUDIO		0x002e	CS5535 AUDIO
+product NS CS5535_USB		0x002f	CS5535 USB
+product NS CS5535_VIDEO		0x0030	CS5535 VIDEO
+product NS SATURN		0x0035	Saturn
+product NS SCX200_ISA		0x0500	SCx200 ISA
+product NS SCX200_SMI		0x0501	SCx200 SMI
+product NS SCX200_IDE		0x0502	SCx200 IDE
+product NS SCX200_AUDIO		0x0503	SCx200 AUDIO
+product NS SCX200_VIDEO		0x0504	SCx200 VIDEO
+product NS SCX200_XBUS		0x0505	SCx200 X-BUS
+product NS SC1100_ISA		0x0510	SC1100 ISA
+product NS SC1100_SMI		0x0511	SC1100 SMI
+product NS SC1100_XBUS		0x0515	SC1100 X-Bus
+product NS NS87410		0xd001	NS87410
+
 /* Number Nine products */
 product NUMBER9 I128		0x2309	Imagine-128
 product NUMBER9 I128_2		0x2339	Imagine-128 II
@@ -6635,7 +6455,6 @@ product NVIDIA MCP65_SATA_1	0x045c	MCP65 SATA
 product NVIDIA MCP65_SATA_2	0x045d	MCP65 SATA
 product NVIDIA MCP65_SATA_3	0x045e	MCP65 SATA
 product NVIDIA MCP65_SATA_4	0x045f	MCP65 SATA
-product NVIDIA GEFORCEGTX285	0x05e3	GeForce GTX 285
 product NVIDIA GEFORCE7000M	0x0533	GeForce 7000M
 product NVIDIA GEFORCE7050_PV	0x053b	GeForce 7050 PV
 product NVIDIA MCP67_MEM1	0x0541	MCP67 Memory
@@ -6675,6 +6494,7 @@ product NVIDIA MCP73_PPB_1	0x056d	MCP73 PCIE
 product NVIDIA MCP73_PPB_2	0x056e	MCP73 PCIE
 product NVIDIA MCP73_PPB_3	0x056f	MCP73 PCIE
 product NVIDIA NFORCE_200	0x05b1	nForce 200
+product NVIDIA GEFORCEGTX285	0x05e3	GeForce GTX 285
 product NVIDIA GEFORCE_9800_GTX	0x0605	GeForce 9800 GTX
 product NVIDIA GEFORCE_8800_GT	0x0611	GeForce 8800 GT
 product NVIDIA GEFORCE_9800_GT	0x0614	GeForce 9800 GT
@@ -6881,6 +6701,27 @@ product NVIDIA GEFORCEGTX745	0x1382	GeForce GTX 745
 product NVIDIA QUADROM1200	0x13b6	Quadro M1200
 product NVIDIA GEFORCEGTX1050M	0x1c8d	Geforce GTX 1050M
 
+/* O2 Micro */
+product O2MICRO FIREWIRE	0x00f7	Firewire
+product O2MICRO OZ6729		0x6729	OZ6729 CardBus
+product O2MICRO OZ6730		0x673a	OZ6730 CardBus
+product O2MICRO OZ6922		0x6825	OZ6922 CardBus
+product O2MICRO OZ6832		0x6832	OZ6832 CardBus
+product O2MICRO OZ6836		0x6836	OZ6836/OZ6860 CardBus
+product O2MICRO OZ6872		0x6872	OZ68[17]2 CardBus
+product O2MICRO OZ6933		0x6933	OZ6933 CardBus
+product O2MICRO OZ6972		0x6972	OZ69[17]2 CardBus
+product O2MICRO OZ7110		0x7110	OZ711Mx Misc
+product O2MICRO OZ7113		0x7113	OZ711EC1 SmartCardBus
+product O2MICRO OZ7114		0x7114	OZ711M1 CardBus
+product O2MICRO OZ7120		0x7120	OZ711MP1 SDHC
+product O2MICRO OZ7130		0x7130	OZ711MP1 XDHC
+product O2MICRO OZ7134		0x7134	OZ711MP1 CardBus
+product O2MICRO OZ7135		0x7135	OZ711EZ1 CardBus
+product O2MICRO OZ7136		0x7136	OZ711SP1 CardBus
+product O2MICRO OZ7223		0x7223	OZ711E0 CardBus
+product O2MICRO OZ8621		0x8621	0Z8621 SD/MMC
+
 /* Oak Technologies products */
 product OAKTECH OTI1007		0x0107	OTI107
 
@@ -6900,12 +6741,12 @@ product OPENBSD CONTROL		0x0777	VMM Control
 product OPTI 82C557		0xc557	82C557 Host
 product OPTI 82C558		0xc558	82C558 ISA
 product OPTI 82C568		0xc568	82C568 IDE
-product OPTI 82D568		0xd568	82D568 IDE
 product OPTI 82C621		0xc621	82C621 IDE
 product OPTI 82C700		0xc700	82C700
 product OPTI 82C701		0xc701	82C701
 product OPTI 82C822		0xc822	82C822
 product OPTI 82C861		0xc861	82C861
+product OPTI 82D568		0xd568	82D568 IDE
 
 /* Option products */
 product OPTION F32		0x000c	3G+ UMTS HSDPA
@@ -6920,9 +6761,9 @@ product MOLEX VSCOM_PCI400L	0x8040	400L
 product OXFORD VSCOM_PCI800L	0x8080	800L
 product OXFORD VSCOM_PCIX10H	0xa000	x10H
 product OXFORD VSCOM_PCI100H	0xa001	100H
-product OXFORD VSCOM_PCI200H	0xa005	200H
 product OXFORD VSCOM_PCI800H_0	0xa003	400H/800H
 product OXFORD VSCOM_PCI800H_1	0xa004	800H
+product OXFORD VSCOM_PCI200H	0xa005	200H
 product OXFORD VSCOM_PCI200HV2	0xe020	200HV2
 product OXFORD2 VSCOM_PCI011H	0x8403	011H
 product OXFORD2 OX16PCI954	0x9501	OX16PCI954
@@ -6938,12 +6779,6 @@ product OXFORD2 OX16PCI952P	0x9523	OX16PCI952 Parallel
 product OXFORD2 OXPCIE952	0xc110	OXPCIE952 Parallel
 product OXFORD2 OXPCIE952S	0xc120	OXPCIE952 Serial
 
-/* Pacific Data products */
-product PDC QSTOR_SATA		0x2068	QStor SATA
-
-/* Packet Engines products */
-product PE GNIC2		0x0911	PMC/GNIC2
-
 /* Parallels products */
 product PARALLELS TOOLS		0x1112	Tools
 product PARALLELS VIDEO		0x1121	Video
@@ -6957,92 +6792,22 @@ product PCTECH RZ1000		0x1000	RZ1000
 product PCTEL MICROMODEM56	0x7879	HSP MicroModem 56
 product PCTEL MICROMODEM56_1	0x7892	HSP MicroModem 56
 
-/* Perle */
-product PERLE SPEED8_LE		0xb008	Speed8 LE
-
-/* Qumranet products */
-product QUMRANET VIO_NET	0x1000	Virtio Network
-product QUMRANET VIO_BLOCK	0x1001	Virtio Storage
-product QUMRANET VIO_MEM	0x1002	Virtio Memory Balloon
-product QUMRANET VIO_CONS	0x1003	Virtio Console
-product QUMRANET VIO_SCSI	0x1004	Virtio SCSI
-product QUMRANET VIO_RNG	0x1005	Virtio RNG
-product QUMRANET VIO1_NET	0x1041	Virtio 1.x Network
-product QUMRANET VIO1_BLOCK	0x1042	Virtio 1.x Storage
-product QUMRANET VIO1_CONS	0x1043	Virtio 1.x Console
-product QUMRANET VIO1_RNG	0x1044	Virtio 1.x RNG
-product QUMRANET VIO1_SCSI	0x1048	Virtio 1.x SCSI
-product QUMRANET VIO1_GPU	0x1050	Virtio 1.x GPU
-product QUMRANET VIO1_INPUT	0x1052	Virtio 1.x Input
-
-/* Ross -> Pequr -> ServerWorks -> Broadcom ServerWorks products */
-product RCC CMIC_LE		0x0000	CMIC-LE
-product RCC CNB20_LE		0x0005	CNB20-LE Host
-product RCC CNB20HE_1		0x0006	CNB20HE Host
-product RCC CNB20_LE_2		0x0007	CNB20-LE Host
-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
-product RCC CNB20_HE		0x0013	CNB20-HE Host
-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
-product RCC HT_1000_PCI		0x0036	HT-1000 PCI
-product RCC CIOB_X2		0x0101	CIOB-X2 PCIX
-product RCC PCIE_PCIX		0x0103	PCIE-PCIX
-product RCC HT_1000_PCIX	0x0104	HT-1000 PCIX
-product RCC CIOB_E		0x0110	CIOB-E
-product RCC HT_2000_PCIX	0x0130	HT-2000 PCIX
-product RCC HT_2000_PCIE	0x0132	HT-2000 PCIE
-product RCC HT_2100_PCIE_1	0x0140	HT-2100 PCIE
-product RCC HT_2100_PCIE_2	0x0141	HT-2100 PCIE
-product RCC HT_2100_PCIE_3	0x0142	HT-2100 PCIE
-product RCC HT_2100_PCIE_5	0x0144	HT-2100 PCIE
-product RCC OSB4		0x0200	OSB4
-product RCC CSB5		0x0201	CSB5
-product RCC CSB6		0x0203	CSB6
-product RCC HT_1000		0x0205	HT-1000
-product RCC IDE			0x0210	IDE
-product RCC OSB4_IDE		0x0211	OSB4 IDE
-product RCC CSB5_IDE		0x0212	CSB5 IDE
-product RCC CSB6_RAID_IDE	0x0213	CSB6 RAID/IDE
-product RCC HT_1000_IDE		0x0214	HT-1000 IDE
-product RCC CSB6_IDE		0x0217	CSB6 IDE
-product RCC USB			0x0220	OSB4/CSB5 USB
-product RCC CSB6_USB		0x0221	CSB6 USB
-product RCC HT_1000_USB		0x0223	HT-1000 USB
-product RCC CSB5_LPC_1		0x0225	CSB5 LPC
-product RCC GCLE_2		0x0227	GCLE-2 Host
-product RCC CSB5_LPC_2		0x0230	CSB5 LPC
-product RCC HT_1000_LPC		0x0234	HT-1000 LPC
-product RCC K2_SATA		0x0240	K2 SATA
-product RCC FRODO4_SATA		0x0241	Frodo4 SATA
-product RCC FRODO8_SATA		0x0242	Frodo8 SATA
-product RCC HT_1000_SATA_1	0x024a	HT-1000 SATA
-product RCC HT_1000_SATA_2	0x024b	HT-1000 SATA
-product RCC HT_1100		0x0408	HT-1100
-product RCC HT_1100_SATA_1	0x0410	HT-1100 SATA
-product RCC HT_1100_SATA_2	0x0411	HT-1100 SATA
+/* Pacific Data products */
+product PDC QSTOR_SATA		0x2068	QStor SATA
 
-/* Rendition products */
-product RENDITION V1000		0x0001	Verite 1000
-product RENDITION V2X00		0x2000	Verite V2x00
+/* Packet Engines products */
+product PE GNIC2		0x0911	PMC/GNIC2
 
-/* Renesas products */
-product RENESAS SH7757_PPB	0x0012	SH7757 PCIE-PCI
-product RENESAS SH7757_SW	0x0013	SH7757 PCIE Switch
-product RENESAS SH7758_PPB	0x001a  SH7758 PCIE-PCI
-product RENESAS SH7758_SW	0x001d	SH7758 PCIE Switch
-product RENESAS UPD720201_XHCI	0x0014	uPD720201 xHCI
-product RENESAS UPD720202_XHCI	0x0015	uPD720202 xHCI
+/* Pericom products */
+product PERICOM PI7C21P100	0x01a7	PI7C21P100 PCIX-PCIX
+product PERICOM PI7C9X2G608GP	0x2608	PI7C9X2G608GP PCIE
+product PERICOM PPB_1		0x8140	PCI-PCI
+product PERICOM PPB_2		0x8150	PCI-PCI
+product PERICOM PI7C9X111SL	0xe111	PI7C9X111SL PCI
+product PERICOM PI7C9X130	0xe130	PI7C9X130 PCIE-PCIX
 
-/* Rhino Equipment products */
-product RHINO R1T1		0x0105	T1/E1/J1
-product RHINO R2T1		0x0605	Dual T1/E1/J1
-product RHINO R4T1		0x0305	Quad T1/E1/J1
+/* Perle */
+product PERLE SPEED8_LE		0xb008	Speed8 LE
 
 /* Philips products */
 product PHILIPS OHCI		0x1561	ISP156x USB
@@ -7067,6 +6832,10 @@ product PICOPOWER PT86C523_2	0x8002	PT86C523_2
 product PIJNENBURG PCC_ISES	0x0001	PCC-ISES
 product PIJNENBURG PCWD_PCI	0x5030	PCI PC WD
 
+/* Planex products */
+product PLANEX FNW_3603_TX	0xab06	FNW-3603-TX
+product PLANEX FNW_3800_TX	0xab07	FNW-3800-TX
+
 /* Platform */
 product PLATFORM ES1849		0x0100	ES1849
 
@@ -7088,7 +6857,6 @@ product PLX PEX_8548		0x8548	PEX 8548
 product	PLX PEX_8603		0x8603	PEX 8603
 product PLX PEX_8605		0x8605	PEX 8605
 product PLX PEX_8608		0x8608	PEX 8608
-product PLX PEX_8617		0x8717	PEX 8617
 product PLX PEX_8612		0x8612	PEX 8612
 product PLX PEX_8613		0x8613	PEX 8613
 product PLX PEX_8614		0x8614	PEX 8614
@@ -7096,6 +6864,7 @@ product PLX PEX_8616		0x8616	PEX 8616
 product PLX PEX_8624		0x8624	PEX 8624
 product PLX PEX_8632		0x8632	PEX 8632
 product PLX PEX_8648		0x8648	PEX 8648
+product PLX PEX_8617		0x8717	PEX 8617
 product PLX PEX_8724		0x8724	PEX 8724
 product PLX PEX_8733		0x8733	PEX 8733
 product PLX PEX_8734		0x8734	PEX 8734
@@ -7182,6 +6951,21 @@ product QUANCOM PWDOG1		0x0010	PWDOG1
 product QUANTUMDESIGNS 8500	0x0001	8500
 product QUANTUMDESIGNS 8580	0x0002	8580
 
+/* Qumranet products */
+product QUMRANET VIO_NET	0x1000	Virtio Network
+product QUMRANET VIO_BLOCK	0x1001	Virtio Storage
+product QUMRANET VIO_MEM	0x1002	Virtio Memory Balloon
+product QUMRANET VIO_CONS	0x1003	Virtio Console
+product QUMRANET VIO_SCSI	0x1004	Virtio SCSI
+product QUMRANET VIO_RNG	0x1005	Virtio RNG
+product QUMRANET VIO1_NET	0x1041	Virtio 1.x Network
+product QUMRANET VIO1_BLOCK	0x1042	Virtio 1.x Storage
+product QUMRANET VIO1_CONS	0x1043	Virtio 1.x Console
+product QUMRANET VIO1_RNG	0x1044	Virtio 1.x RNG
+product QUMRANET VIO1_SCSI	0x1048	Virtio 1.x SCSI
+product QUMRANET VIO1_GPU	0x1050	Virtio 1.x GPU
+product QUMRANET VIO1_INPUT	0x1052	Virtio 1.x Input
+
 /* Ralink Technology Corporation */
 product RALINK RT2460A		0x0101	RT2460A
 product RALINK RT2560		0x0201	RT2560
@@ -7209,6 +6993,58 @@ product RALINK RT5390_1		0x539a	RT5390
 product RALINK RT5390_2		0x539b	RT5390
 product RALINK RT5390_3		0x539f	RT5390
 
+/* Ross -> Pequr -> ServerWorks -> Broadcom ServerWorks products */
+product RCC CMIC_LE		0x0000	CMIC-LE
+product RCC CNB20_LE		0x0005	CNB20-LE Host
+product RCC CNB20HE_1		0x0006	CNB20HE Host
+product RCC CNB20_LE_2		0x0007	CNB20-LE Host
+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
+product RCC CNB20_HE		0x0013	CNB20-HE Host
+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
+product RCC HT_1000_PCI		0x0036	HT-1000 PCI
+product RCC CIOB_X2		0x0101	CIOB-X2 PCIX
+product RCC PCIE_PCIX		0x0103	PCIE-PCIX
+product RCC HT_1000_PCIX	0x0104	HT-1000 PCIX
+product RCC CIOB_E		0x0110	CIOB-E
+product RCC HT_2000_PCIX	0x0130	HT-2000 PCIX
+product RCC HT_2000_PCIE	0x0132	HT-2000 PCIE
+product RCC HT_2100_PCIE_1	0x0140	HT-2100 PCIE
+product RCC HT_2100_PCIE_2	0x0141	HT-2100 PCIE
+product RCC HT_2100_PCIE_3	0x0142	HT-2100 PCIE
+product RCC HT_2100_PCIE_5	0x0144	HT-2100 PCIE
+product RCC OSB4		0x0200	OSB4
+product RCC CSB5		0x0201	CSB5
+product RCC CSB6		0x0203	CSB6
+product RCC HT_1000		0x0205	HT-1000
+product RCC IDE			0x0210	IDE
+product RCC OSB4_IDE		0x0211	OSB4 IDE
+product RCC CSB5_IDE		0x0212	CSB5 IDE
+product RCC CSB6_RAID_IDE	0x0213	CSB6 RAID/IDE
+product RCC HT_1000_IDE		0x0214	HT-1000 IDE
+product RCC CSB6_IDE		0x0217	CSB6 IDE
+product RCC USB			0x0220	OSB4/CSB5 USB
+product RCC CSB6_USB		0x0221	CSB6 USB
+product RCC HT_1000_USB		0x0223	HT-1000 USB
+product RCC CSB5_LPC_1		0x0225	CSB5 LPC
+product RCC GCLE_2		0x0227	GCLE-2 Host
+product RCC CSB5_LPC_2		0x0230	CSB5 LPC
+product RCC HT_1000_LPC		0x0234	HT-1000 LPC
+product RCC K2_SATA		0x0240	K2 SATA
+product RCC FRODO4_SATA		0x0241	Frodo4 SATA
+product RCC FRODO8_SATA		0x0242	Frodo8 SATA
+product RCC HT_1000_SATA_1	0x024a	HT-1000 SATA
+product RCC HT_1000_SATA_2	0x024b	HT-1000 SATA
+product RCC HT_1100		0x0408	HT-1100
+product RCC HT_1100_SATA_1	0x0410	HT-1100 SATA
+product RCC HT_1100_SATA_2	0x0411	HT-1100 SATA
+
 /* RDC products */
 product RDC R1010_IDE		0x1010	R1010 IDE
 product RDC R1011_IDE		0x1011	R1011 IDE
@@ -7250,11 +7086,11 @@ product REALTEK RT8169SC	0x8167	8169SC
 product REALTEK RT8168		0x8168	8168
 product REALTEK RT8169		0x8169	8169
 product REALTEK RTL8192SE	0x8172	8192SE
-product REALTEK RT8180		0x8180	8180
-product REALTEK RT8185		0x8185	8185
 product REALTEK RTL8188CE	0x8176	8188CE
 product REALTEK RTL8192CE	0x8178	RTL8192CE
 product REALTEK RTL8188EE	0x8179	8188EE
+product REALTEK RT8180		0x8180	8180
+product REALTEK RT8185		0x8185	8185
 product REALTEK RTL8192EE	0x818b	RTL8192EE
 product REALTEK RTL8190P	0x8190	RTL8190P
 product REALTEK RTL8192E	0x8192	RTL8192E
@@ -7273,6 +7109,23 @@ product REDHAT SDMMC		0x0007	SD/MMC
 product REDHAT HB		0x0008	Host
 product REDHAT QXL		0x0100	QXL Video
 
+/* Rendition products */
+product RENDITION V1000		0x0001	Verite 1000
+product RENDITION V2X00		0x2000	Verite V2x00
+
+/* Renesas products */
+product RENESAS SH7757_PPB	0x0012	SH7757 PCIE-PCI
+product RENESAS SH7757_SW	0x0013	SH7757 PCIE Switch
+product RENESAS UPD720201_XHCI	0x0014	uPD720201 xHCI
+product RENESAS UPD720202_XHCI	0x0015	uPD720202 xHCI
+product RENESAS SH7758_PPB	0x001a  SH7758 PCIE-PCI
+product RENESAS SH7758_SW	0x001d	SH7758 PCIE Switch
+
+/* Rhino Equipment products */
+product RHINO R1T1		0x0105	T1/E1/J1
+product RHINO R4T1		0x0305	Quad T1/E1/J1
+product RHINO R2T1		0x0605	Dual T1/E1/J1
+
 /* RICOH products */
 product RICOH RF5C465		0x0465	5C465 CardBus
 product RICOH RF5C466		0x0466	5C466 CardBus
@@ -7306,8 +7159,8 @@ product S3 TRIO32		0x8810	Trio32
 product S3 TRIO64		0x8811	Trio32/64
 product S3 AURORA64P		0x8812	Aurora64V+
 product S3 TRIO64UVP		0x8814	Trio64UV+
-product S3 868			0x8880	868
 product S3 VIRGE_VX		0x883d	ViRGE VX
+product S3 868			0x8880	868
 product S3 928			0x88b0	86C928
 product S3 864_0		0x88c0	86C864-0
 product S3 864_1		0x88c1	86C864-1
@@ -7369,18 +7222,13 @@ product SAMSUNG2 NVME_171X	0xa820	NVMe
 product SAMSUNG2 NVME_172X	0xa821	NVMe
 product SAMSUNG2 NVME_172X_A_B	0xa822	NVMe
 
-/* Sangoma products */
-product SANGOMA A10X		0x0300	A10x
-
-/* Digi International */
-product DIGI NEO4		0x00b0	Neo-4
-product DIGI NEO8		0x00b1	Neo-8
-product DIGI NEO8_PCIE		0x00f0	Neo-8
-
 /* SanDisk (Western Digital) */
 product SANDISK WDSXXXG1X0C	0x5001	WD Black NVMe
 product SANDISK WDSXXXG2X0C	0x5002	WD Black NVMe
 
+/* Sangoma products */
+product SANGOMA A10X		0x0300	A10x
+
 /* Schneider & Koch (SysKonnect) */
 product SCHNEIDERKOCH FDDI	0x4000	FDDI
 product SCHNEIDERKOCH SK98XX	0x4300	SK-98xx
@@ -7416,6 +7264,47 @@ product SGSTHOMSON 1764X	0x1746	STG 1764X
 product SIGMA 64GX		0x6401	64GX
 product SIGMA DVDMAGICPRO	0x8300	DVDmagic-PRO
 
+/* SIIG products */
+product SIIG	1000		0x1000	I/O
+product SIIG	1001		0x1001	I/O
+product SIIG	1002		0x1002	I/O
+product SIIG	1010		0x1010	I/O
+product SIIG	1011		0x1011	I/O
+product SIIG	1012		0x1012	I/O
+product SIIG	1020		0x1020	I/O
+product SIIG	1021		0x1021	I/O
+product SIIG	1030		0x1030	I/O
+product SIIG	1031		0x1031	I/O
+product SIIG	1032		0x1032	I/O
+product SIIG	1034		0x1034	I/O
+product SIIG	1035		0x1035	I/O
+product SIIG	1036		0x1036	I/O
+product SIIG	1050		0x1050	I/O
+product SIIG	1051		0x1051	I/O
+product SIIG	1052		0x1052	I/O
+product SIIG	2000		0x2000	I/O
+product SIIG	2001		0x2001	I/O
+product SIIG	2002		0x2002	I/O
+product SIIG	2010		0x2010	I/O
+product SIIG	2011		0x2011	I/O
+product SIIG	2012		0x2012	I/O
+product SIIG	2020		0x2020	I/O
+product SIIG	2021		0x2021	I/O
+product SIIG	2030		0x2030	I/O
+product SIIG	2031		0x2031	I/O
+product SIIG	2032		0x2032	I/O
+product SIIG	2040		0x2040	I/O
+product SIIG	2041		0x2041	I/O
+product SIIG	2042		0x2042	I/O
+product SIIG	2050		0x2050	I/O
+product SIIG	2051		0x2051	I/O
+product SIIG	2052		0x2052	I/O
+product SIIG	2060		0x2060	I/O
+product SIIG	2061		0x2061	I/O
+product SIIG	2062		0x2062	I/O
+product SIIG	2081		0x2081	I/O
+product SIIG	2082		0x2082	I/O
+
 /* Silan products */
 product SILAN SC92301		0x2301	SC92301
 product SILAN 8139D		0x8139	8139D
@@ -7443,10 +7332,10 @@ product SIS 300			0x0300	300/305/630 VGA
 product SIS 315PRO_VGA		0x0325	315 Pro VGA
 product SIS 85C501		0x0406	85C501
 product SIS 85C496		0x0496	85C496
-product SIS 85C596		0x0596	85C596
 product SIS 530			0x0530	530 PCI
 product SIS 540			0x0540	540 PCI
 product SIS 550			0x0550	550 PCI
+product SIS 85C596		0x0596	85C596
 product SIS 85C601		0x0601	85C601 EIDE
 product SIS 620			0x0620	620 PCI
 product SIS 630			0x0630	630 PCI
@@ -7553,6 +7442,11 @@ product SNI TCPMSE		0x0005	Tulip, power, switch extender
 product SNI FPGAIBUS		0x4942	FPGA I-Bus Tracer for MBD
 product SNI SZB6120		0x6120	SZB6120
 
+/* Solarflare products */
+product SOLARFLARE FALCON_P	0x0703	Falcon P
+product SOLARFLARE FALCON_S	0x6703	Falcon S
+product SOLARFLARE EF1002	0xc101	EF1002
+
 /* Sony products */
 product SONY CXD1947A		0x8009	CXD1947A FireWire
 product SONY CXD3222		0x8039	CXD3222 FireWire
@@ -7610,6 +7504,109 @@ product SURECOM NE34		0x0e34	NE-34
 product SYBA 4S2P		0x0781	4S2P
 product SYBA 4S			0x0786	4S
 
+/* NCR/Symbios Logic/LSI products */
+product SYMBIOS 810		0x0001	53c810
+product SYMBIOS 820		0x0002	53c820
+product SYMBIOS 825		0x0003	53c825
+product SYMBIOS 815		0x0004	53c815
+product SYMBIOS 810AP		0x0005	53c810AP
+product SYMBIOS 860		0x0006	53c860
+product SYMBIOS	1510D		0x000a	53c1510D
+product SYMBIOS	896		0x000b	53c896
+product SYMBIOS	895		0x000c	53c895
+product SYMBIOS	885		0x000d	53c885
+product SYMBIOS 875		0x000f	53c875
+product SYMBIOS	1510		0x0010	53c1510
+product SYMBIOS	895A		0x0012	53c895A
+product SYMBIOS MEGARAID_3516	0x0014	MegaRAID SAS3516
+product SYMBIOS MEGARAID_3416	0x0015	MegaRAID SAS3416
+product SYMBIOS MEGARAID_3508	0x0016	MegaRAID SAS3508
+product SYMBIOS MEGARAID_3408	0x0017	MegaRAID SAS3408
+product SYMBIOS MEGARAID_3504	0x001b	MegaRAID SAS3504
+product SYMBIOS MEGARAID_3404	0x001c	MegaRAID SAS3404
+product SYMBIOS 1010		0x0020	53c1010-33
+product SYMBIOS 1010_2		0x0021	53c1010-66
+product SYMBIOS 1030		0x0030	53c1030
+product SYMBIOS 1030ZC		0x0031	53c1030ZC
+product SYMBIOS 1030_1035	0x0032	53c1035
+product SYMBIOS 1030ZC_1035	0x0033	53c1035
+product SYMBIOS 1035		0x0040	53c1035
+product SYMBIOS 1035ZC		0x0041	53c1035ZC
+product SYMBIOS SAS1064		0x0050	SAS1064
+product SYMBIOS SAS1068		0x0054	SAS1068
+product SYMBIOS SAS1068_2	0x0055	SAS1068
+product SYMBIOS SAS1064E	0x0056	SAS1064E
+product SYMBIOS SAS1064E_2	0x0057	SAS1064E
+product SYMBIOS SAS1068E	0x0058	SAS1068E
+product SYMBIOS SAS1068E_2	0x0059	SAS1068E
+product SYMBIOS SAS1066E	0x005a	SAS1066E
+product SYMBIOS MEGARAID_2208	0x005b	MegaRAID SAS2208
+product SYMBIOS SAS1064A	0x005c	SAS1064A
+product SYMBIOS MEGARAID_3108	0x005d	MegaRAID SAS3108
+product SYMBIOS SAS1066		0x005e	SAS1066
+product SYMBIOS MEGARAID_3008	0x005f	MegaRAID SAS3008
+product SYMBIOS SAS1078		0x0060	SAS1078
+product SYMBIOS SAS1078_PCIE	0x0062	SAS1078
+product SYMBIOS SAS2116_1	0x0064	SAS2116
+product SYMBIOS SAS2116_2	0x0065	SAS2116
+product SYMBIOS SAS2308_3	0x006e	SAS2308
+product SYMBIOS SAS2004		0x0070	SAS2004
+product SYMBIOS SAS2008		0x0072	SAS2008
+product SYMBIOS SAS2008_1	0x0073	MegaRAID SAS2008
+product SYMBIOS SAS2108_3	0x0074	SAS2108
+product SYMBIOS SAS2108_4	0x0076	SAS2108
+product SYMBIOS SAS2108_5	0x0077	SAS2108
+product SYMBIOS SAS2108_1	0x0078	MegaRAID SAS2108 CRYPTO GEN2
+product SYMBIOS SAS2108_2	0x0079	MegaRAID SAS2108 GEN2
+product SYMBIOS SAS1078DE	0x007c	SAS1078DE
+product SYMBIOS SSS6200		0x007e	SSS6200
+product SYMBIOS SAS2208_1	0x0080	SAS2208
+product SYMBIOS SAS2208_2	0x0081	SAS2208
+product SYMBIOS SAS2208_3	0x0082	SAS2208
+product SYMBIOS SAS2208_4	0x0083	SAS2208
+product SYMBIOS SAS2208_5	0x0084	SAS2208
+product SYMBIOS SAS2208_6	0x0085	SAS2208
+product SYMBIOS SAS2308_1	0x0086	SAS2308
+product SYMBIOS SAS2308_2	0x0087	SAS2308
+product SYMBIOS 875J		0x008f	53c875J
+product SYMBIOS SAS3108_1	0x0090	SAS3108
+product SYMBIOS SAS3108_2	0x0091	SAS3108
+product SYMBIOS SAS3108_3	0x0094	SAS3108
+product SYMBIOS SAS3108_4	0x0095	SAS3108
+product SYMBIOS SAS3004		0x0096	SAS3004
+product SYMBIOS SAS3008		0x0097	SAS3008
+product SYMBIOS SAS3516		0x00aa	SAS3516
+product SYMBIOS SAS3516_1	0x00ab	SAS3516
+product SYMBIOS SAS3416		0x00ac	SAS3416
+product SYMBIOS SAS3508		0x00ad	SAS3508
+product SYMBIOS SAS3508_1	0x00ae	SAS3508
+product SYMBIOS SAS3408		0x00af	SAS3408
+product SYMBIOS MEGARAID_320	0x0407	MegaRAID 320
+product SYMBIOS MEGARAID_3202E	0x0408	MegaRAID 320-2E
+product SYMBIOS MEGARAID_SATA	0x0409	MegaRAID SATA 4x/8x
+product SYMBIOS MEGARAID_SAS	0x0411	MegaRAID SAS 1064R
+product SYMBIOS MEGARAID_VERDE_ZCR 0x0413 MegaRAID Verde ZCR
+product SYMBIOS FC909		0x0620	FC909
+product SYMBIOS FC909A		0x0621	FC909A
+product SYMBIOS FC929		0x0622	FC929
+product SYMBIOS FC929_1		0x0623	FC929
+product SYMBIOS FC919		0x0624	FC919
+product SYMBIOS FC919_1		0x0625	FC919
+product SYMBIOS FC929X		0x0626	FC929X
+product SYMBIOS FC919X		0x0628	FC919X
+product SYMBIOS FC949X		0x0640	FC949X
+product SYMBIOS FC939X		0x0642	FC939X
+product SYMBIOS FC949E		0x0646	FC949E
+product SYMBIOS YELLOWFIN_1	0x0701	Yellowfin
+product SYMBIOS YELLOWFIN_2	0x0702	Yellowfin
+product SYMBIOS 61C102		0x0901	61C102
+product SYMBIOS 63C815		0x1000	63C815
+product SYMBIOS 1030R		0x1030	53c1030R
+product SYMBIOS MEGARAID	0x1960	MegaRAID
+
+/* Packet Engines products */
+product SYMBIOS PE_GNIC		0x0702	Packet Engines G-NIC
+
 /* Symbol */
 product SYMBOL LA41X3		0x0001	Spectrum24 LA41X3
 
@@ -7617,11 +7614,8 @@ product SYMBOL LA41X3		0x0001	Spectrum24 LA41X3
 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 ISA
-
-/* TTTech */
-product TTTECH MC322		0x000a	MC322
+product SYMPHONY2 82C101	0x0001	82C101
 
 /* Tamarack Microelectronics */
 product TAMARACK TC9021		0x1021	TC9021
@@ -7631,16 +7625,6 @@ product TAMARACK TC9021_ALT	0x9021	TC9021
 product TECHSAN B2C2_SKY2PC	0x2104	B2C2 Sky2PC
 product TECHSAN B2C2_SKY2PC_2	0x2200	B2C2 Sky2PC
 
-/* Ampere Computing */
-product AMPERE EMAG_PCIE_1	0xe005	eMAG PCIE
-product AMPERE EMAG_PCIE_2	0xe006	eMAG PCIE
-product AMPERE EMAG_PCIE_3	0xe007	eMAG PCIE
-product AMPERE EMAG_PCIE_4	0xe008	eMAG PCIE
-product AMPERE EMAG_PCIE_5	0xe009	eMAG PCIE
-product AMPERE EMAG_PCIE_6	0xe00a	eMAG PCIE
-product AMPERE EMAG_PCIE_7	0xe00b	eMAG PCIE
-product AMPERE EMAG_PCIE_8	0xe00c	eMAG PCIE
-
 /* Tehuti Networks Ltd */
 product TEHUTI TN3009		0x3009	TN3009
 product TEHUTI TN3010		0x3010	TN3010
@@ -7650,8 +7634,8 @@ product TEHUTI TN3014		0x3014	TN3014
 product TEKRAM DC290		0xdc29	DC-290(M)
 
 /* Tekram Technology products(2) */
-product TEKRAM2	DC690C		0x690c	DC-690C
 product TEKRAM2 DC3X5U		0x0391	DC-3x5U
+product TEKRAM2	DC690C		0x690c	DC-690C
 
 /* TerraTec Electronic Gmbh */
 product TERRATEC TVALUE_PLUS	0x1127	Terratec TV+
@@ -7817,6 +7801,12 @@ product TSENG ET4000_W32P_D	0x3207	ET4000w32pD
 product TSENG ET6000		0x3208	ET6000/ET6100
 product TSENG ET6300		0x4702	ET6300
 
+/* TTTech */
+product TTTECH MC322		0x000a	MC322
+
+/* Turtle Beach products */
+product TURTLEBEACH SANTA_CRUZ	0x3357	Santa Cruz
+
 /* Tvia products */
 product TVIA IGA1680		0x1680	IGA-1680
 product TVIA IGA1682		0x1682	IGA-1682
@@ -7828,8 +7818,8 @@ product TVIA CP5050		0x5050	CyberPro 5050
 product TVIA CP5202		0x5202	CyberPro 5202
 product TVIA CP5252		0x5252	CyberPro 5252
 
-/* Turtle Beach products */
-product TURTLEBEACH SANTA_CRUZ	0x3357	Santa Cruz
+/* TXIC */
+product	TXIC TX382B		0x3273	TX382B
 
 /* ULSI Systems products */
 product ULSI US201		0x0201	US201
@@ -7857,8 +7847,8 @@ product UMC UM8891N		0xe891	UM8891N
 product UMIS NVME		0x2263	NVMe
 
 /* US Robotics */
-product USR2 USR997902		0x0116	USR997902
 product USR 3CP5610		0x1008	3CP5610
+product USR2 USR997902		0x0116	USR997902
 product USR2 WL11000P		0x3685	WL11000P
 
 /* V3 Semiconductor products */
@@ -8053,19 +8043,19 @@ product VIATECH VX900_SCRATCH	0x6410	VX900 Scratch
 product VIATECH CHROME9_HD	0x7122	Chrome9 HD
 product VIATECH K8M800_7	0x7204	K8M800 Host
 product VIATECH VT8378_VGA	0x7205	VT8378 VGA
-product VIATECH PT894_5		0x7308	PT894 Host
-product VIATECH P4M890_7	0x7327	P4M890 Host
-product VIATECH K8M890_7	0x7336	K8M890 Host
-product VIATECH VX800_7		0x7353	VX800 Host
-product VIATECH P4M900_7	0x7364	P4M900 Host
 product VIATECH K8T890_7	0x7238	K8T890 Host
 product VIATECH PT880_7		0x7258	PT880 Host
 product VIATECH PM800_PCI	0x7259	PM800 PCI
 product VIATECH KT880_7		0x7269	KT880 Host
 product VIATECH K8HTB_7		0x7282	K8HTB Host
+product VIATECH PT894_5		0x7308	PT894 Host
 product VIATECH CN700_7		0x7314	CN700 Host
 product VIATECH CX700_7		0x7324	CX700 Host
+product VIATECH P4M890_7	0x7327	P4M890 Host
+product VIATECH K8M890_7	0x7336	K8M890 Host
 product VIATECH VT3351_7	0x7351	VT3351 Host
+product VIATECH VX800_7		0x7353	VX800 Host
+product VIATECH P4M900_7	0x7364	P4M900 Host
 product VIATECH VX900_2		0x7410	VX900 Host
 product VIATECH VT8231_ISA	0x8231	VT8231 ISA
 product VIATECH VT8231_PWR	0x8235	VT8231 PMG
@@ -8085,10 +8075,10 @@ product VIATECH HDA_1		0x9170	HD Audio
 product VIATECH VX800_SDMMC	0x9530	VX800 SD/MMC
 product VIATECH VX800_SDIO	0x95d0	VX800 SDIO
 product VIATECH K8T890_PPB_A	0xa238	K8T890
-product VIATECH VX900_PCIE_0	0xa410	VX900 PCIE
 product VIATECH P4M890_PPB_1	0xa327	P4M890
 product VIATECH VX800_A		0xa353	VX800 Host
 product VIATECH P4M900_PPB_1	0xa364	P4M900
+product VIATECH VX900_PCIE_0	0xa410	VX900 PCIE
 product VIATECH VT8633_AGP	0xb091	VT8633 AGP
 product VIATECH VT8366_AGP	0xb099	VT8366 AGP
 product VIATECH VT8361_AGP	0xb112	VT8361 AGP
@@ -8117,6 +8107,38 @@ product VIATECH VX800_PCIE_2	0xf353	VX800 PCIE
 /* Vitesse Semiconductor products */
 product VITESSE VSC_7174	0x7174	VSC-7174 SATA
 
+/* VLSI products */
+product VLSI 82C592		0x0005	82C592 CPU
+product VLSI 82C593		0x0006	82C593 ISA
+product VLSI 82C594		0x0007	82C594 Wildcat
+product VLSI 82C596597		0x0008	82C596/597 Wildcat ISA
+product VLSI 82C541		0x000c	82C541
+product VLSI 82C543		0x000d	82C543
+product VLSI 82C532		0x0101	82C532
+product VLSI 82C534		0x0102	82C534
+product VLSI 82C535		0x0104	82C535
+product VLSI 82C147		0x0105	82C147
+product VLSI 82C975		0x0200	82C975
+product VLSI 82C925		0x0280	82C925
+
+/* VMware */
+product VMWARE SVGA2		0x0405	SVGA II
+product VMWARE SVGA		0x0710	SVGA
+product VMWARE NET		0x0720	VMXNET
+product VMWARE VMCI		0x0740	VMCI
+product VMWARE EHCI		0x0770	EHCI
+product VMWARE UHCI		0x0774	UHCI
+product VMWARE XHCI		0x0778	xHCI
+product VMWARE XHCI_2		0x0779	xHCI
+product VMWARE PCI		0x0790	PCI
+product VMWARE PCIE		0x07a0	PCIE
+product VMWARE NET_3		0x07b0	VMXNET3
+product VMWARE PVSCSI		0x07c0	PVSCSI
+product VMWARE AHCI		0x07e0	AHCI
+product VMWARE NVME		0x07f0	NVMe
+product VMWARE VMI		0x0801	VMI
+product VMWARE HDA		0x1977	HD Audio
+
 /* Vortex Computer Systems products */
 product VORTEX GDT_60X0		0x0000	GDT6000/6020/6050
 product VORTEX GDT_6000B	0x0001	GDT6000B/6010
@@ -8189,41 +8211,11 @@ product VORTEX GDT_8X22RZ	0x02f6	GDT8x22RZ
 product VORTEX GDT_ICP		0x0300	ICP
 product VORTEX GDT_ICP2		0x0301	ICP
 
-/* VLSI products */
-product VLSI 82C592		0x0005	82C592 CPU
-product VLSI 82C593		0x0006	82C593 ISA
-product VLSI 82C594		0x0007	82C594 Wildcat
-product VLSI 82C596597		0x0008	82C596/597 Wildcat ISA
-product VLSI 82C541		0x000c	82C541
-product VLSI 82C543		0x000d	82C543
-product VLSI 82C532		0x0101	82C532
-product VLSI 82C534		0x0102	82C534
-product VLSI 82C535		0x0104	82C535
-product VLSI 82C147		0x0105	82C147
-product VLSI 82C975		0x0200	82C975
-product VLSI 82C925		0x0280	82C925
-
-/* VMware */
-product VMWARE SVGA2		0x0405	SVGA II
-product VMWARE SVGA		0x0710	SVGA
-product VMWARE NET		0x0720	VMXNET
-product VMWARE VMCI		0x0740	VMCI
-product VMWARE EHCI		0x0770	EHCI
-product VMWARE UHCI		0x0774	UHCI
-product VMWARE XHCI		0x0778	xHCI
-product VMWARE XHCI_2		0x0779	xHCI
-product VMWARE PCI		0x0790	PCI
-product VMWARE PCIE		0x07a0	PCIE
-product VMWARE NET_3		0x07b0	VMXNET3
-product VMWARE PVSCSI		0x07c0	PVSCSI
-product VMWARE AHCI		0x07e0	AHCI
-product VMWARE NVME		0x07f0	NVMe
-product VMWARE VMI		0x0801	VMI
-product VMWARE HDA		0x1977	HD Audio
-
-/* Weitek products */
-product WEITEK P9000		0x9001	P9000
-product WEITEK P9100		0x9100	P9100
+/* Nanjing QinHeng Electronics products */
+product WCH CH352		0x3253	CH352
+product WCH2 CH351		0x2273	CH351
+product WCH2 CH382_2		0x3250	CH382
+product WCH2 CH382_1		0x3253	CH382
 
 /* Western Digital products */
 product WD WD33C193A		0x0193	WD33C193A
@@ -8236,12 +8228,16 @@ product WD WD34C296		0x4296	WD34C296
 product WD WD9710		0x9710	WD9610
 product WD 90C			0xc24a	90C
 
+/* Weitek products */
+product WEITEK P9000		0x9001	P9000
+product WEITEK P9100		0x9100	P9100
+
 /* Winbond Electronics products */
 product WINBOND W83769F		0x0001	W83769F
+product WINBOND W83C553F_1	0x0105	W83C553F
+product WINBOND W83C553F_0	0x0565	W83C553F ISA
 product WINBOND W89C840F	0x0840	W89C840F
 product WINBOND W89C940F	0x0940	Linksys EtherPCI II
-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