sort and some cleanup.

1 files changed, 52 insertions, 52 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 10f4c6280e7..2b37f9eeb82 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.988 2005/12/30 21:25:52 jolan Exp $
+$OpenBSD: pcidevs,v 1.989 2005/12/31 03:55:58 fgsch Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -426,8 +426,8 @@ product ACCTON EN2242		0x1216	EN2242
 product ACCTON EN1217		0x1217	EN1217
 
 /* Addtron products */
-product ADDTRON 8139		0x1360	rtl8139
 product ADDTRON RHINEII		0x1320	RhineII
+product ADDTRON 8139		0x1360	rtl8139
 product ADDTRON AWA100		0x7001	AWA-100
 
 /* Acer products */
@@ -463,9 +463,9 @@ product ALI M5243		0x5243	M5243 AGP/PCI-PCI
 product ALI M5246		0x5246	M5246 AGP
 product ALI M5247		0x5247	M5247 AGP/PCI-PC
 product ALI M5249		0x5249	M5249 PCI-PCI
-product ALI M524B		0x524B	M524B PCIE
-product ALI M524C		0x524C	M524C PCIE
-product ALI M524D		0x524D	M524D PCIE
+product ALI M524B		0x524b	M524B PCIE
+product ALI M524C		0x524c	M524C PCIE
+product ALI M524D		0x524d	M524D PCIE
 product ALI M5263		0x5263	M5263 LAN
 product ALI M5281		0x5281	M5281 SATA
 product ALI M5287		0x5287	M5287 SATA
@@ -714,7 +714,7 @@ product ASUSTEK HFCPCI		0x0675	ISDN
 
 /* ATI Technologies */
 product ATI RADEON_M241P	0x3150	Radeon Mobility X600
-product ATI RADEON_X600_RV380	0x3e50	Radeon X600 (RV380) 
+product ATI RADEON_X600_RV380	0x3e50	Radeon X600 (RV380)
 product ATI RADEON_X600_RV380_S	0x3e70	Radeon X600 (RV380) Sec
 product ATI RADEON_9600PRO	0x4150	Radeon 9600 Pro
 product ATI RADEON_9600LE	0x4151	Radeon 9600 LE
@@ -733,12 +733,14 @@ product ATI SB200_PPB		0x4342	SB200 PCI-PCI
 product ATI SB200_EHCI		0x4345	SB200 USB2
 product ATI SB200_OHCI_1	0x4347	SB200 USB
 product ATI SB200_OHCI_2	0x4348	SB200 USB
+product ATI IXP_IDE_200		0x4349	IXP200 IDE
 product ATI SB200_ISA		0x434c	SB200 PCI-ISA
 product ATI IXP_MODEM_200	0x434d	IXP200 Modem
 product ATI SB200_SMB		0x4353	SB200 SMBus
 product ATI MACH64_CT		0x4354	Mach64 CT
 product ATI MACH64_CX		0x4358	Mach64 CX
 product ATI IXP_AUDIO_300	0x4361	IXP300 AC97
+product ATI IXP_IDE_300		0x4369	IXP300 IDE
 product ATI IXP_AUDIO_400	0x4370	IXP400 AC97
 product ATI IXP_PCI_400		0x4371	IXP400 PCI
 product ATI IXP_SMB_400		0x4372	IXP400 SMBus
@@ -746,17 +748,15 @@ product ATI IXP_EHCI_400	0x4373	IXP400 USB2
 product ATI IXP_OHCI_400_1	0x4374	IXP400 USB
 product ATI IXP_OHCI_400_2	0x4375	IXP400 USB
 product ATI IXP_ISA_400		0x4377	IXP400 ISA
+product ATI IXP_IDE_400		0x4376	IXP400 IDE
 product ATI IXP_MODEM_400	0x4378	IXP400 Modem
 product ATI IXP_SATA_400_1	0x4379	IXP400 SATA
 product ATI IXP_SATA_400_2	0x437a	IXP400 SATA
-product ATI IXP_IDE_200		0x4349	IXP200 IDE
-product ATI IXP_IDE_300		0x4369	IXP300 IDE
-product ATI IXP_IDE_400		0x4376	IXP400 IDE
 product ATI MACH64_ET		0x4554	Mach64 ET
 product ATI RAGEPRO		0x4742	Rage Pro
 product ATI MACH64_GD		0x4744	Mach64 GD
 product ATI MACH64_GI		0x4749	Mach64 GI
-product ATI MACH64_GL		0x474C	Mach64 GL
+product ATI MACH64_GL		0x474c	Mach64 GL
 product ATI MACH64_GM		0x474d	Mach64 GM
 product ATI MACH64_GN		0x474e	Mach64 GN
 product ATI MACH64_GO		0x474f	Mach64 GO
@@ -804,14 +804,14 @@ product ATI RADEON_AIW		0x5144	AIW Radeon
 product ATI RADEON_QE		0x5145	Radeon QE
 product ATI RADEON_QF		0x5146	Radeon QF
 product ATI RADEON_QG		0x5147	Radeon QG
-product ATI R200_QL		0x514C	Radeon 8500 QL
-product ATI R200_QM		0x514D	Radeon 9100 QM
-product ATI R200_QN		0x514E	Radeon 8500 QN
-product ATI R200_QO		0x514F	Radeon 8500 QO
+product ATI R200_QL		0x514c	Radeon 8500 QL
+product ATI R200_QM		0x514d	Radeon 9100 QM
+product ATI R200_QN		0x514e	Radeon 8500 QN
+product ATI R200_QO		0x514f	Radeon 8500 QO
 product ATI RV200_QW		0x5157	Radeon 7500 QW
 product ATI RADEON_QY		0x5159	Radeon VE QY
-product ATI RADEON_QZ		0x515A	Radeon VE QZ
-product ATI R200_Ql		0x516C	Radeon 8500 Ql
+product ATI RADEON_QZ		0x515a	Radeon VE QZ
+product ATI R200_Ql		0x516c	Radeon 8500 Ql
 product ATI RAGE128_GL		0x5245	Rage 128 GL
 product ATI RAGE_MAGNUM		0x5246	Rage Magnum
 product ATI RAGE128_RG		0x5247	Rage 128 RG
@@ -902,9 +902,9 @@ product AVANCE2 ALS4000		0x4000	ALS4000
 product	AVLAB LPPCI4S		0x2150	LP-PCI 4 Serial
 
 /* AVM products */
+product AVM B1			0x0700	BRI 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
 
 /* Belkin Components products */
@@ -1227,8 +1227,8 @@ product DELL PERC_3DI_3_SUB2	0x011b	PERC 3/Di
 product DELL PERC_3DI_3_SUB3	0x0121	PERC 3/Di
 
 /* Delta Electronics products */
-product DELTA 8139		0x1360	8139
 product DELTA RHINEII		0x1320	RhineII
+product DELTA 8139		0x1360	8139
 
 /* Diamond products */
 product DIAMOND VIPER		0x9001	Viper/PCI
@@ -1245,11 +1245,11 @@ product DLINK DGE560T_2		0x4b01	DGE-560T_2
 product DLINK DGE530T		0x4c00	DGE-530T
 
 /* Distributed Processing Technology products */
+product DPT MEMCTLR		0x1012	Memory Control
 product DPT SC_RAID		0xa400	SmartCache/Raid
 product DPT I960_PPB		0xa500	PCI-PCI
 product DPT RAID_I2O		0xa501	SmartRAID (I2O)
 product DPT 2005S		0xa511	SmartRAID 2005S
-product DPT MEMCTLR		0x1012	Memory Control
 
 /* Dolphin products */
 product DOLPHIN PCISCI		0x0658	PCI-SCI
@@ -1510,8 +1510,8 @@ product INTEL PRO_100_VE_6	0x1051	PRO/100 VE
 product INTEL PRO_100_VM_6	0x1052	PRO/100 VM
 product INTEL PRO_100_VM_7	0x1053	PRO/100 VM
 product INTEL PRO_100_M		0x1059	PRO/100 M
-product INTEL 82571EB_COPPER	0x105E	PRO/1000 PT (82571EB)
-product INTEL 82571EB_FIBER	0x105F	PRO/1000 PF (82571EB)
+product INTEL 82571EB_COPPER	0x105e	PRO/1000 PT (82571EB)
+product INTEL 82571EB_FIBER	0x105f	PRO/1000 PF (82571EB)
 product INTEL 82571EB_SERDES	0x1060	PRO/1000 PB (82571EB)
 product INTEL 82801FB_LAN_2	0x1064	82801FB LAN
 product INTEL PRO_100_VE_7	0x1065	PRO/100 VE
@@ -1526,17 +1526,17 @@ product INTEL 82541GI		0x1076	PRO/1000MT (82541GI)
 product INTEL 82541GI_MOBILE	0x1077	PRO/1000MT Mobile (82541GI)
 product INTEL 82541ER		0x1078	PRO/1000MT (82541ER)
 product INTEL 82546GB_COPPER	0x1079	PRO/1000MT (82546GB)
-product INTEL 82546GB_FIBER	0x107A	PRO/1000MF (82546GB)
-product INTEL 82546GB_SERDES	0x107B	PRO/1000MF (82546GB)
-product INTEL 82541GI_LF	0x107C	PRO/1000GT (82541GI)
-product INTEL 82572EI_COPPER	0x107D	PRO/1000 PT (82572EI)
-product INTEL 82572EI_FIBER	0x107E	PRO/1000 PF (82572EI)
-product INTEL 82572EI_SERDES	0x107F	PRO/1000 PB (82572EI)
-product INTEL 82546GB_PCIE	0x108A	PRO/1000MT (82546GB)
-product INTEL 82573E		0x108B	PRO/1000MT (82573E)
-product INTEL 82573E_IAMT	0x108C	PRO/1000MT (82573E)
-product INTEL 82573L		0x109A	PRO/1000MT (82573L)
-product INTEL 82597EX_CX4	0x109E	PRO/10GbE CX4 (82597EX)
+product INTEL 82546GB_FIBER	0x107a	PRO/1000MF (82546GB)
+product INTEL 82546GB_SERDES	0x107b	PRO/1000MF (82546GB)
+product INTEL 82541GI_LF	0x107c	PRO/1000GT (82541GI)
+product INTEL 82572EI_COPPER	0x107d	PRO/1000 PT (82572EI)
+product INTEL 82572EI_FIBER	0x107e	PRO/1000 PF (82572EI)
+product INTEL 82572EI_SERDES	0x107f	PRO/1000 PB (82572EI)
+product INTEL 82546GB_PCIE	0x108a	PRO/1000MT (82546GB)
+product INTEL 82573E		0x108b	PRO/1000MT (82573E)
+product INTEL 82573E_IAMT	0x108c	PRO/1000MT (82573E)
+product INTEL 82573L		0x109a	PRO/1000MT (82573L)
+product INTEL 82597EX_CX4	0x109e	PRO/10GbE CX4 (82597EX)
 product INTEL 82546GB_QUAD_COPPER 0x1099	PRO/1000MT QP (82546GB)
 product INTEL 82815_DC100_HUB	0x1100	82815 Hub
 product INTEL 82815_DC100_AGP	0x1101	82815 AGP
@@ -2439,7 +2439,7 @@ product NVIDIA GEFORCE4TI4400	0x0251	GeForce4 Ti 4400
 product NVIDIA GEFORCE4TI4200	0x0253	GeForce4 Ti 4200
 product NVIDIA QUADRO4900XGL	0x0258	Quadro4 900 XGL
 product NVIDIA QUADRO4750XGL	0x0259	Quadro4 750 XGL
-product NVIDIA QUADRO4700XGL	0x025B	Quadro4 700 XGL
+product NVIDIA QUADRO4700XGL	0x025b	Quadro4 700 XGL
 product NVIDIA MCP51_SATA	0x0266	MCP51 SATA
 product NVIDIA MCP51_SATA2	0x0267	MCP51 SATA
 product NVIDIA MCP51_LAN1	0x0268	MPC51 LAN
@@ -2473,8 +2473,8 @@ product NVIDIA MCP55_LAN2	0x0373	MPC55 LAN
 product OAKTECH OTI1007		0x0107	OTI107
 
 /* Olicom */
-product OLICOM OC2183		0x0013	OC2183
 product OLICOM OC2325		0x0012	OC2325
+product OLICOM OC2183		0x0013	OC2183
 product OLICOM OC2326		0x0014	OC2326
 
 /* Omega Micro products */
@@ -2586,19 +2586,9 @@ product PLX 9050		0x9050	I/O 9050
 product PLX 9080		0x9080	I/O 9080
 
 /* Promise products */
-product PROMISE DC5030		0x5300	DC5030
-product PROMISE PDC20246	0x4d33	PDC20246
-product PROMISE PDC20262	0x4d38	PDC20262
-product PROMISE PDC20263	0x0d38	PDC20263
 product PROMISE PDC20265	0x0d30	PDC20265
-product PROMISE PDC20267	0x4d30	PDC20267
-product PROMISE PDC20268	0x4d68	PDC20268
-product PROMISE PDC20268R	0x6268	PDC20268R
-product PROMISE PDC20269	0x4d69	PDC20269
-product PROMISE PDC20271	0x6269	PDC20271
+product PROMISE PDC20263	0x0d38	PDC20263
 product PROMISE PDC20275	0x1275	PDC20275
-product PROMISE PDC20276	0x5275	PDC20276
-product PROMISE PDC20277	0x7275	PDC20277
 product PROMISE PDC20318	0x3318	PDC20318
 product PROMISE PDC20319	0x3319	PDC20319
 product PROMISE PDC20371	0x3371	PDC20371
@@ -2607,11 +2597,21 @@ product PROMISE PDC20376	0x3376	PDC20376
 product PROMISE PDC20377	0x3377	PDC20377
 product PROMISE PDC20378	0x3373	PDC20378
 product PROMISE PDC20379	0x3372	PDC20379
+product PROMISE PDC20267	0x4d30	PDC20267
+product PROMISE PDC20246	0x4d33	PDC20246
+product PROMISE PDC20262	0x4d38	PDC20262
+product PROMISE PDC20268	0x4d68	PDC20268
+product PROMISE PDC20269	0x4d69	PDC20269
+product PROMISE PDC20276	0x5275	PDC20276
+product PROMISE DC5030		0x5300	DC5030
+product PROMISE PDC20268R	0x6268	PDC20268R
+product PROMISE PDC20271	0x6269	PDC20271
 product PROMISE PDC20617	0x6617	PDC20617
 product PROMISE PDC20618	0x6626	PDC20618
 product PROMISE PDC20619	0x6629	PDC20619
 product PROMISE PDC20620	0x6620	PDC20620
 product PROMISE PDC20621	0x6621	PDC20621
+product PROMISE PDC20277	0x7275	PDC20277
 
 /* QLogic products */
 product QLOGIC ISP10160		0x1016	ISP10160
@@ -2716,7 +2716,7 @@ product SCHNEIDERKOCH SK98XX	0x4300	SK-98xx
 product SCHNEIDERKOCH SK98XX2	0x4320	SK-98xx v2.0
 product SCHNEIDERKOCH SK9D21	0x4400	SK-9D21
 product SCHNEIDERKOCH SK9Sxx	0x9000	SK-9Sxx
-product SCHNEIDERKOCH SK9Exx	0x9E00	SK-9Exx
+product SCHNEIDERKOCH SK9Exx	0x9e00	SK-9Exx
 
 /* SGI products */
 product SGI TIGON		0x0009	Tigon
@@ -2811,10 +2811,10 @@ product SIS 7016		0x7016	7016 10/100BaseTX
 product SIS 7018		0x7018	7018 Audio
 
 /* SMC products */
-product SMC 37C665		0x1000	FDC 37C665
-product SMC 37C922		0x1001	FDC 37C922
 product SMC 83C170		0x0005	83C170 (EPIC/100)
 product SMC 83C175		0x0006	83C175 (EPIC/100)
+product SMC 37C665		0x1000	FDC 37C665
+product SMC 37C922		0x1001	FDC 37C922
 
 /* Silicon Motion products */
 product SMI SM710		0x0710	LynxEM
@@ -2914,7 +2914,7 @@ product TI TSB43AB23		0x8024	TSB43AB23 FireWire
 product TI TSB43AB21		0x8026	TSB43AB21 FireWire
 product TI PCI4451_FW		0x8027	PCI4451 FireWire
 product TI PCI4510_FW		0x8029	PCI4510 FireWire
-product TI PCI4520_FW		0x802A	PCI4520 FireWire
+product TI PCI4520_FW		0x802a	PCI4520 FireWire
 product TI PCI7410_FW		0x802b	PCI7(4-6)10 FireWire
 product TI PCI7420_FW		0x802e	PCI7x20 FireWire
 product TI PCI7XX1		0x8031	PCI7XX1 CardBus
@@ -3061,9 +3061,9 @@ product UMC UM8891N		0xe891	UM8891N
 /* ULSI Systems products */
 product ULSI US201		0x0201	US201
 
-/* US Robotics */
-product USR 3CP5610		0x1008	3CP5610
+/* US Rebotics */
 product USR2 USR997902		0x0116	USR997902
+product USR 3CP5610		0x1008	3CP5610
 product USR2 WL11000P		0x3685	WL11000P
 
 /* V3 Semiconductor products */
@@ -3272,8 +3272,8 @@ product VLSI 82C975		0x0200	82C975
 product VLSI 82C925		0x0280	82C925
 
 /* VMware */
-product VMWARE VIRTUAL		0x0710	Virtual SVGA
 product VMWARE VIRTUAL2		0x0405	Virtual SVGA II
+product VMWARE VIRTUAL		0x0710	Virtual SVGA
 product VMWARE NET		0x0720	Virtual NIC
 
 /* Weitek products */