regen.

2 files changed, 142 insertions, 142 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 30e0b13f28c..5c1859aeb4c 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.987 2005/12/29 23:28:47 reyk 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 $	*/
 
@@ -431,8 +431,8 @@
 #define	PCI_PRODUCT_ACCTON_EN1217	0x1217		/* EN1217 */
 
 /* Addtron products */
-#define	PCI_PRODUCT_ADDTRON_8139	0x1360		/* rtl8139 */
 #define	PCI_PRODUCT_ADDTRON_RHINEII	0x1320		/* RhineII */
+#define	PCI_PRODUCT_ADDTRON_8139	0x1360		/* rtl8139 */
 #define	PCI_PRODUCT_ADDTRON_AWA100	0x7001		/* AWA-100 */
 
 /* Acer products */
@@ -468,9 +468,9 @@
 #define	PCI_PRODUCT_ALI_M5246	0x5246		/* M5246 AGP */
 #define	PCI_PRODUCT_ALI_M5247	0x5247		/* M5247 AGP/PCI-PC */
 #define	PCI_PRODUCT_ALI_M5249	0x5249		/* M5249 PCI-PCI */
-#define	PCI_PRODUCT_ALI_M524B	0x524B		/* M524B PCIE */
-#define	PCI_PRODUCT_ALI_M524C	0x524C		/* M524C PCIE */
-#define	PCI_PRODUCT_ALI_M524D	0x524D		/* M524D PCIE */
+#define	PCI_PRODUCT_ALI_M524B	0x524b		/* M524B PCIE */
+#define	PCI_PRODUCT_ALI_M524C	0x524c		/* M524C PCIE */
+#define	PCI_PRODUCT_ALI_M524D	0x524d		/* M524D PCIE */
 #define	PCI_PRODUCT_ALI_M5263	0x5263		/* M5263 LAN */
 #define	PCI_PRODUCT_ALI_M5281	0x5281		/* M5281 SATA */
 #define	PCI_PRODUCT_ALI_M5287	0x5287		/* M5287 SATA */
@@ -738,12 +738,14 @@
 #define	PCI_PRODUCT_ATI_SB200_EHCI	0x4345		/* SB200 USB2 */
 #define	PCI_PRODUCT_ATI_SB200_OHCI_1	0x4347		/* SB200 USB */
 #define	PCI_PRODUCT_ATI_SB200_OHCI_2	0x4348		/* SB200 USB */
+#define	PCI_PRODUCT_ATI_IXP_IDE_200	0x4349		/* IXP200 IDE */
 #define	PCI_PRODUCT_ATI_SB200_ISA	0x434c		/* SB200 PCI-ISA */
 #define	PCI_PRODUCT_ATI_IXP_MODEM_200	0x434d		/* IXP200 Modem */
 #define	PCI_PRODUCT_ATI_SB200_SMB	0x4353		/* SB200 SMBus */
 #define	PCI_PRODUCT_ATI_MACH64_CT	0x4354		/* Mach64 CT */
 #define	PCI_PRODUCT_ATI_MACH64_CX	0x4358		/* Mach64 CX */
 #define	PCI_PRODUCT_ATI_IXP_AUDIO_300	0x4361		/* IXP300 AC97 */
+#define	PCI_PRODUCT_ATI_IXP_IDE_300	0x4369		/* IXP300 IDE */
 #define	PCI_PRODUCT_ATI_IXP_AUDIO_400	0x4370		/* IXP400 AC97 */
 #define	PCI_PRODUCT_ATI_IXP_PCI_400	0x4371		/* IXP400 PCI */
 #define	PCI_PRODUCT_ATI_IXP_SMB_400	0x4372		/* IXP400 SMBus */
@@ -751,17 +753,15 @@
 #define	PCI_PRODUCT_ATI_IXP_OHCI_400_1	0x4374		/* IXP400 USB */
 #define	PCI_PRODUCT_ATI_IXP_OHCI_400_2	0x4375		/* IXP400 USB */
 #define	PCI_PRODUCT_ATI_IXP_ISA_400	0x4377		/* IXP400 ISA */
+#define	PCI_PRODUCT_ATI_IXP_IDE_400	0x4376		/* IXP400 IDE */
 #define	PCI_PRODUCT_ATI_IXP_MODEM_400	0x4378		/* IXP400 Modem */
 #define	PCI_PRODUCT_ATI_IXP_SATA_400_1	0x4379		/* IXP400 SATA */
 #define	PCI_PRODUCT_ATI_IXP_SATA_400_2	0x437a		/* IXP400 SATA */
-#define	PCI_PRODUCT_ATI_IXP_IDE_200	0x4349		/* IXP200 IDE */
-#define	PCI_PRODUCT_ATI_IXP_IDE_300	0x4369		/* IXP300 IDE */
-#define	PCI_PRODUCT_ATI_IXP_IDE_400	0x4376		/* IXP400 IDE */
 #define	PCI_PRODUCT_ATI_MACH64_ET	0x4554		/* Mach64 ET */
 #define	PCI_PRODUCT_ATI_RAGEPRO	0x4742		/* Rage Pro */
 #define	PCI_PRODUCT_ATI_MACH64_GD	0x4744		/* Mach64 GD */
 #define	PCI_PRODUCT_ATI_MACH64_GI	0x4749		/* Mach64 GI */
-#define	PCI_PRODUCT_ATI_MACH64_GL	0x474C		/* Mach64 GL */
+#define	PCI_PRODUCT_ATI_MACH64_GL	0x474c		/* Mach64 GL */
 #define	PCI_PRODUCT_ATI_MACH64_GM	0x474d		/* Mach64 GM */
 #define	PCI_PRODUCT_ATI_MACH64_GN	0x474e		/* Mach64 GN */
 #define	PCI_PRODUCT_ATI_MACH64_GO	0x474f		/* Mach64 GO */
@@ -809,14 +809,14 @@
 #define	PCI_PRODUCT_ATI_RADEON_QE	0x5145		/* Radeon QE */
 #define	PCI_PRODUCT_ATI_RADEON_QF	0x5146		/* Radeon QF */
 #define	PCI_PRODUCT_ATI_RADEON_QG	0x5147		/* Radeon QG */
-#define	PCI_PRODUCT_ATI_R200_QL	0x514C		/* Radeon 8500 QL */
-#define	PCI_PRODUCT_ATI_R200_QM	0x514D		/* Radeon 9100 QM */
-#define	PCI_PRODUCT_ATI_R200_QN	0x514E		/* Radeon 8500 QN */
-#define	PCI_PRODUCT_ATI_R200_QO	0x514F		/* Radeon 8500 QO */
+#define	PCI_PRODUCT_ATI_R200_QL	0x514c		/* Radeon 8500 QL */
+#define	PCI_PRODUCT_ATI_R200_QM	0x514d		/* Radeon 9100 QM */
+#define	PCI_PRODUCT_ATI_R200_QN	0x514e		/* Radeon 8500 QN */
+#define	PCI_PRODUCT_ATI_R200_QO	0x514f		/* Radeon 8500 QO */
 #define	PCI_PRODUCT_ATI_RV200_QW	0x5157		/* Radeon 7500 QW */
 #define	PCI_PRODUCT_ATI_RADEON_QY	0x5159		/* Radeon VE QY */
-#define	PCI_PRODUCT_ATI_RADEON_QZ	0x515A		/* Radeon VE QZ */
-#define	PCI_PRODUCT_ATI_R200_Ql	0x516C		/* Radeon 8500 Ql */
+#define	PCI_PRODUCT_ATI_RADEON_QZ	0x515a		/* Radeon VE QZ */
+#define	PCI_PRODUCT_ATI_R200_Ql	0x516c		/* Radeon 8500 Ql */
 #define	PCI_PRODUCT_ATI_RAGE128_GL	0x5245		/* Rage 128 GL */
 #define	PCI_PRODUCT_ATI_RAGE_MAGNUM	0x5246		/* Rage Magnum */
 #define	PCI_PRODUCT_ATI_RAGE128_RG	0x5247		/* Rage 128 RG */
@@ -907,9 +907,9 @@
 #define	PCI_PRODUCT_AVLAB_LPPCI4S	0x2150		/* LP-PCI 4 Serial */
 
 /* AVM products */
+#define	PCI_PRODUCT_AVM_B1	0x0700		/* BRI ISDN */
 #define	PCI_PRODUCT_AVM_FRITZ_CARD	0x0a00		/* Fritz ISDN */
 #define	PCI_PRODUCT_AVM_FRITZ_PCI_V2_ISDN	0x0e00		/* Fritz v2.0 ISDN */
-#define	PCI_PRODUCT_AVM_B1	0x0700		/* BRI ISDN */
 #define	PCI_PRODUCT_AVM_T1	0x1200		/* PRI T1 ISDN */
 
 /* Belkin Components products */
@@ -1232,8 +1232,8 @@
 #define	PCI_PRODUCT_DELL_PERC_3DI_3_SUB3	0x0121		/* PERC 3/Di */
 
 /* Delta Electronics products */
-#define	PCI_PRODUCT_DELTA_8139	0x1360		/* 8139 */
 #define	PCI_PRODUCT_DELTA_RHINEII	0x1320		/* RhineII */
+#define	PCI_PRODUCT_DELTA_8139	0x1360		/* 8139 */
 
 /* Diamond products */
 #define	PCI_PRODUCT_DIAMOND_VIPER	0x9001		/* Viper/PCI */
@@ -1250,11 +1250,11 @@
 #define	PCI_PRODUCT_DLINK_DGE530T	0x4c00		/* DGE-530T */
 
 /* Distributed Processing Technology products */
+#define	PCI_PRODUCT_DPT_MEMCTLR	0x1012		/* Memory Control */
 #define	PCI_PRODUCT_DPT_SC_RAID	0xa400		/* SmartCache/Raid */
 #define	PCI_PRODUCT_DPT_I960_PPB	0xa500		/* PCI-PCI */
 #define	PCI_PRODUCT_DPT_RAID_I2O	0xa501		/* SmartRAID (I2O) */
 #define	PCI_PRODUCT_DPT_2005S	0xa511		/* SmartRAID 2005S */
-#define	PCI_PRODUCT_DPT_MEMCTLR	0x1012		/* Memory Control */
 
 /* Dolphin products */
 #define	PCI_PRODUCT_DOLPHIN_PCISCI	0x0658		/* PCI-SCI */
@@ -1515,8 +1515,8 @@
 #define	PCI_PRODUCT_INTEL_PRO_100_VM_6	0x1052		/* PRO/100 VM */
 #define	PCI_PRODUCT_INTEL_PRO_100_VM_7	0x1053		/* PRO/100 VM */
 #define	PCI_PRODUCT_INTEL_PRO_100_M	0x1059		/* PRO/100 M */
-#define	PCI_PRODUCT_INTEL_82571EB_COPPER	0x105E		/* PRO/1000 PT (82571EB) */
-#define	PCI_PRODUCT_INTEL_82571EB_FIBER	0x105F		/* PRO/1000 PF (82571EB) */
+#define	PCI_PRODUCT_INTEL_82571EB_COPPER	0x105e		/* PRO/1000 PT (82571EB) */
+#define	PCI_PRODUCT_INTEL_82571EB_FIBER	0x105f		/* PRO/1000 PF (82571EB) */
 #define	PCI_PRODUCT_INTEL_82571EB_SERDES	0x1060		/* PRO/1000 PB (82571EB) */
 #define	PCI_PRODUCT_INTEL_82801FB_LAN_2	0x1064		/* 82801FB LAN */
 #define	PCI_PRODUCT_INTEL_PRO_100_VE_7	0x1065		/* PRO/100 VE */
@@ -1531,17 +1531,17 @@
 #define	PCI_PRODUCT_INTEL_82541GI_MOBILE	0x1077		/* PRO/1000MT Mobile (82541GI) */
 #define	PCI_PRODUCT_INTEL_82541ER	0x1078		/* PRO/1000MT (82541ER) */
 #define	PCI_PRODUCT_INTEL_82546GB_COPPER	0x1079		/* PRO/1000MT (82546GB) */
-#define	PCI_PRODUCT_INTEL_82546GB_FIBER	0x107A		/* PRO/1000MF (82546GB) */
-#define	PCI_PRODUCT_INTEL_82546GB_SERDES	0x107B		/* PRO/1000MF (82546GB) */
-#define	PCI_PRODUCT_INTEL_82541GI_LF	0x107C		/* PRO/1000GT (82541GI) */
-#define	PCI_PRODUCT_INTEL_82572EI_COPPER	0x107D		/* PRO/1000 PT (82572EI) */
-#define	PCI_PRODUCT_INTEL_82572EI_FIBER	0x107E		/* PRO/1000 PF (82572EI) */
-#define	PCI_PRODUCT_INTEL_82572EI_SERDES	0x107F		/* PRO/1000 PB (82572EI) */
-#define	PCI_PRODUCT_INTEL_82546GB_PCIE	0x108A		/* PRO/1000MT (82546GB) */
-#define	PCI_PRODUCT_INTEL_82573E	0x108B		/* PRO/1000MT (82573E) */
-#define	PCI_PRODUCT_INTEL_82573E_IAMT	0x108C		/* PRO/1000MT (82573E) */
-#define	PCI_PRODUCT_INTEL_82573L	0x109A		/* PRO/1000MT (82573L) */
-#define	PCI_PRODUCT_INTEL_82597EX_CX4	0x109E		/* PRO/10GbE CX4 (82597EX) */
+#define	PCI_PRODUCT_INTEL_82546GB_FIBER	0x107a		/* PRO/1000MF (82546GB) */
+#define	PCI_PRODUCT_INTEL_82546GB_SERDES	0x107b		/* PRO/1000MF (82546GB) */
+#define	PCI_PRODUCT_INTEL_82541GI_LF	0x107c		/* PRO/1000GT (82541GI) */
+#define	PCI_PRODUCT_INTEL_82572EI_COPPER	0x107d		/* PRO/1000 PT (82572EI) */
+#define	PCI_PRODUCT_INTEL_82572EI_FIBER	0x107e		/* PRO/1000 PF (82572EI) */
+#define	PCI_PRODUCT_INTEL_82572EI_SERDES	0x107f		/* PRO/1000 PB (82572EI) */
+#define	PCI_PRODUCT_INTEL_82546GB_PCIE	0x108a		/* PRO/1000MT (82546GB) */
+#define	PCI_PRODUCT_INTEL_82573E	0x108b		/* PRO/1000MT (82573E) */
+#define	PCI_PRODUCT_INTEL_82573E_IAMT	0x108c		/* PRO/1000MT (82573E) */
+#define	PCI_PRODUCT_INTEL_82573L	0x109a		/* PRO/1000MT (82573L) */
+#define	PCI_PRODUCT_INTEL_82597EX_CX4	0x109e		/* PRO/10GbE CX4 (82597EX) */
 #define	PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER	0x1099		/* PRO/1000MT QP (82546GB) */
 #define	PCI_PRODUCT_INTEL_82815_DC100_HUB	0x1100		/* 82815 Hub */
 #define	PCI_PRODUCT_INTEL_82815_DC100_AGP	0x1101		/* 82815 AGP */
@@ -2444,7 +2444,7 @@
 #define	PCI_PRODUCT_NVIDIA_GEFORCE4TI4200	0x0253		/* GeForce4 Ti 4200 */
 #define	PCI_PRODUCT_NVIDIA_QUADRO4900XGL	0x0258		/* Quadro4 900 XGL */
 #define	PCI_PRODUCT_NVIDIA_QUADRO4750XGL	0x0259		/* Quadro4 750 XGL */
-#define	PCI_PRODUCT_NVIDIA_QUADRO4700XGL	0x025B		/* Quadro4 700 XGL */
+#define	PCI_PRODUCT_NVIDIA_QUADRO4700XGL	0x025b		/* Quadro4 700 XGL */
 #define	PCI_PRODUCT_NVIDIA_MCP51_SATA	0x0266		/* MCP51 SATA */
 #define	PCI_PRODUCT_NVIDIA_MCP51_SATA2	0x0267		/* MCP51 SATA */
 #define	PCI_PRODUCT_NVIDIA_MCP51_LAN1	0x0268		/* MPC51 LAN */
@@ -2478,8 +2478,8 @@
 #define	PCI_PRODUCT_OAKTECH_OTI1007	0x0107		/* OTI107 */
 
 /* Olicom */
-#define	PCI_PRODUCT_OLICOM_OC2183	0x0013		/* OC2183 */
 #define	PCI_PRODUCT_OLICOM_OC2325	0x0012		/* OC2325 */
+#define	PCI_PRODUCT_OLICOM_OC2183	0x0013		/* OC2183 */
 #define	PCI_PRODUCT_OLICOM_OC2326	0x0014		/* OC2326 */
 
 /* Omega Micro products */
@@ -2591,19 +2591,9 @@
 #define	PCI_PRODUCT_PLX_9080	0x9080		/* I/O 9080 */
 
 /* Promise products */
-#define	PCI_PRODUCT_PROMISE_DC5030	0x5300		/* DC5030 */
-#define	PCI_PRODUCT_PROMISE_PDC20246	0x4d33		/* PDC20246 */
-#define	PCI_PRODUCT_PROMISE_PDC20262	0x4d38		/* PDC20262 */
-#define	PCI_PRODUCT_PROMISE_PDC20263	0x0d38		/* PDC20263 */
 #define	PCI_PRODUCT_PROMISE_PDC20265	0x0d30		/* PDC20265 */
-#define	PCI_PRODUCT_PROMISE_PDC20267	0x4d30		/* PDC20267 */
-#define	PCI_PRODUCT_PROMISE_PDC20268	0x4d68		/* PDC20268 */
-#define	PCI_PRODUCT_PROMISE_PDC20268R	0x6268		/* PDC20268R */
-#define	PCI_PRODUCT_PROMISE_PDC20269	0x4d69		/* PDC20269 */
-#define	PCI_PRODUCT_PROMISE_PDC20271	0x6269		/* PDC20271 */
+#define	PCI_PRODUCT_PROMISE_PDC20263	0x0d38		/* PDC20263 */
 #define	PCI_PRODUCT_PROMISE_PDC20275	0x1275		/* PDC20275 */
-#define	PCI_PRODUCT_PROMISE_PDC20276	0x5275		/* PDC20276 */
-#define	PCI_PRODUCT_PROMISE_PDC20277	0x7275		/* PDC20277 */
 #define	PCI_PRODUCT_PROMISE_PDC20318	0x3318		/* PDC20318 */
 #define	PCI_PRODUCT_PROMISE_PDC20319	0x3319		/* PDC20319 */
 #define	PCI_PRODUCT_PROMISE_PDC20371	0x3371		/* PDC20371 */
@@ -2612,11 +2602,21 @@
 #define	PCI_PRODUCT_PROMISE_PDC20377	0x3377		/* PDC20377 */
 #define	PCI_PRODUCT_PROMISE_PDC20378	0x3373		/* PDC20378 */
 #define	PCI_PRODUCT_PROMISE_PDC20379	0x3372		/* PDC20379 */
+#define	PCI_PRODUCT_PROMISE_PDC20267	0x4d30		/* PDC20267 */
+#define	PCI_PRODUCT_PROMISE_PDC20246	0x4d33		/* PDC20246 */
+#define	PCI_PRODUCT_PROMISE_PDC20262	0x4d38		/* PDC20262 */
+#define	PCI_PRODUCT_PROMISE_PDC20268	0x4d68		/* PDC20268 */
+#define	PCI_PRODUCT_PROMISE_PDC20269	0x4d69		/* PDC20269 */
+#define	PCI_PRODUCT_PROMISE_PDC20276	0x5275		/* PDC20276 */
+#define	PCI_PRODUCT_PROMISE_DC5030	0x5300		/* DC5030 */
+#define	PCI_PRODUCT_PROMISE_PDC20268R	0x6268		/* PDC20268R */
+#define	PCI_PRODUCT_PROMISE_PDC20271	0x6269		/* PDC20271 */
 #define	PCI_PRODUCT_PROMISE_PDC20617	0x6617		/* PDC20617 */
 #define	PCI_PRODUCT_PROMISE_PDC20618	0x6626		/* PDC20618 */
 #define	PCI_PRODUCT_PROMISE_PDC20619	0x6629		/* PDC20619 */
 #define	PCI_PRODUCT_PROMISE_PDC20620	0x6620		/* PDC20620 */
 #define	PCI_PRODUCT_PROMISE_PDC20621	0x6621		/* PDC20621 */
+#define	PCI_PRODUCT_PROMISE_PDC20277	0x7275		/* PDC20277 */
 
 /* QLogic products */
 #define	PCI_PRODUCT_QLOGIC_ISP10160	0x1016		/* ISP10160 */
@@ -2721,7 +2721,7 @@
 #define	PCI_PRODUCT_SCHNEIDERKOCH_SK98XX2	0x4320		/* SK-98xx v2.0 */
 #define	PCI_PRODUCT_SCHNEIDERKOCH_SK9D21	0x4400		/* SK-9D21 */
 #define	PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx	0x9000		/* SK-9Sxx */
-#define	PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx	0x9E00		/* SK-9Exx */
+#define	PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx	0x9e00		/* SK-9Exx */
 
 /* SGI products */
 #define	PCI_PRODUCT_SGI_TIGON	0x0009		/* Tigon */
@@ -2816,10 +2816,10 @@
 #define	PCI_PRODUCT_SIS_7018	0x7018		/* 7018 Audio */
 
 /* SMC products */
-#define	PCI_PRODUCT_SMC_37C665	0x1000		/* FDC 37C665 */
-#define	PCI_PRODUCT_SMC_37C922	0x1001		/* FDC 37C922 */
 #define	PCI_PRODUCT_SMC_83C170	0x0005		/* 83C170 (EPIC/100) */
 #define	PCI_PRODUCT_SMC_83C175	0x0006		/* 83C175 (EPIC/100) */
+#define	PCI_PRODUCT_SMC_37C665	0x1000		/* FDC 37C665 */
+#define	PCI_PRODUCT_SMC_37C922	0x1001		/* FDC 37C922 */
 
 /* Silicon Motion products */
 #define	PCI_PRODUCT_SMI_SM710	0x0710		/* LynxEM */
@@ -2919,7 +2919,7 @@
 #define	PCI_PRODUCT_TI_TSB43AB21	0x8026		/* TSB43AB21 FireWire */
 #define	PCI_PRODUCT_TI_PCI4451_FW	0x8027		/* PCI4451 FireWire */
 #define	PCI_PRODUCT_TI_PCI4510_FW	0x8029		/* PCI4510 FireWire */
-#define	PCI_PRODUCT_TI_PCI4520_FW	0x802A		/* PCI4520 FireWire */
+#define	PCI_PRODUCT_TI_PCI4520_FW	0x802a		/* PCI4520 FireWire */
 #define	PCI_PRODUCT_TI_PCI7410_FW	0x802b		/* PCI7(4-6)10 FireWire */
 #define	PCI_PRODUCT_TI_PCI7420_FW	0x802e		/* PCI7x20 FireWire */
 #define	PCI_PRODUCT_TI_PCI7XX1	0x8031		/* PCI7XX1 CardBus */
@@ -3066,9 +3066,9 @@
 /* ULSI Systems products */
 #define	PCI_PRODUCT_ULSI_US201	0x0201		/* US201 */
 
-/* US Robotics */
-#define	PCI_PRODUCT_USR_3CP5610	0x1008		/* 3CP5610 */
+/* US Rebotics */
 #define	PCI_PRODUCT_USR2_USR997902	0x0116		/* USR997902 */
+#define	PCI_PRODUCT_USR_3CP5610	0x1008		/* 3CP5610 */
 #define	PCI_PRODUCT_USR2_WL11000P	0x3685		/* WL11000P */
 
 /* V3 Semiconductor products */
@@ -3277,8 +3277,8 @@
 #define	PCI_PRODUCT_VLSI_82C925	0x0280		/* 82C925 */
 
 /* VMware */
-#define	PCI_PRODUCT_VMWARE_VIRTUAL	0x0710		/* Virtual SVGA */
 #define	PCI_PRODUCT_VMWARE_VIRTUAL2	0x0405		/* Virtual SVGA II */
+#define	PCI_PRODUCT_VMWARE_VIRTUAL	0x0710		/* Virtual SVGA */
 #define	PCI_PRODUCT_VMWARE_NET	0x0720		/* Virtual NIC */
 
 /* Weitek products */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 62187a6b4ec..552b64eec27 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.987 2005/12/29 23:28:47 reyk 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 $	*/
 
@@ -475,14 +475,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "EN1217",
 	},
 	{
-	    PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139,
-	    "rtl8139",
-	},
-	{
 	    PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_RHINEII,
 	    "RhineII",
 	},
 	{
+	    PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139,
+	    "rtl8139",
+	},
+	{
 	    PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_AWA100,
 	    "AWA-100",
 	},
@@ -1531,6 +1531,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "SB200 USB",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_200,
+	    "IXP200 IDE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_ISA,
 	    "SB200 PCI-ISA",
 	},
@@ -1555,6 +1559,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP300 AC97",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_300,
+	    "IXP300 IDE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_400,
 	    "IXP400 AC97",
 	},
@@ -1583,6 +1591,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP400 ISA",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_400,
+	    "IXP400 IDE",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_MODEM_400,
 	    "IXP400 Modem",
 	},
@@ -1595,18 +1607,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "IXP400 SATA",
 	},
 	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_200,
-	    "IXP200 IDE",
-	},
-	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_300,
-	    "IXP300 IDE",
-	},
-	{
-	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_IDE_400,
-	    "IXP400 IDE",
-	},
-	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,
 	    "Mach64 ET",
 	},
@@ -2151,6 +2151,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "LP-PCI 4 Serial",
 	},
 	{
+	    PCI_VENDOR_AVM, PCI_PRODUCT_AVM_B1,
+	    "BRI ISDN",
+	},
+	{
 	    PCI_VENDOR_AVM, PCI_PRODUCT_AVM_FRITZ_CARD,
 	    "Fritz ISDN",
 	},
@@ -2159,10 +2163,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Fritz v2.0 ISDN",
 	},
 	{
-	    PCI_VENDOR_AVM, PCI_PRODUCT_AVM_B1,
-	    "BRI ISDN",
-	},
-	{
 	    PCI_VENDOR_AVM, PCI_PRODUCT_AVM_T1,
 	    "PRI T1 ISDN",
 	},
@@ -3203,14 +3203,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "PERC 3/Di",
 	},
 	{
-	    PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_8139,
-	    "8139",
-	},
-	{
 	    PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_RHINEII,
 	    "RhineII",
 	},
 	{
+	    PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_8139,
+	    "8139",
+	},
+	{
 	    PCI_VENDOR_DIAMOND, PCI_PRODUCT_DIAMOND_VIPER,
 	    "Viper/PCI",
 	},
@@ -3251,6 +3251,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "DGE-530T",
 	},
 	{
+	    PCI_VENDOR_DPT, PCI_PRODUCT_DPT_MEMCTLR,
+	    "Memory Control",
+	},
+	{
 	    PCI_VENDOR_DPT, PCI_PRODUCT_DPT_SC_RAID,
 	    "SmartCache/Raid",
 	},
@@ -3267,10 +3271,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "SmartRAID 2005S",
 	},
 	{
-	    PCI_VENDOR_DPT, PCI_PRODUCT_DPT_MEMCTLR,
-	    "Memory Control",
-	},
-	{
 	    PCI_VENDOR_DOLPHIN, PCI_PRODUCT_DOLPHIN_PCISCI,
 	    "PCI-SCI",
 	},
@@ -7467,14 +7467,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "OTI107",
 	},
 	{
-	    PCI_VENDOR_OLICOM, PCI_PRODUCT_OLICOM_OC2183,
-	    "OC2183",
-	},
-	{
 	    PCI_VENDOR_OLICOM, PCI_PRODUCT_OLICOM_OC2325,
 	    "OC2325",
 	},
 	{
+	    PCI_VENDOR_OLICOM, PCI_PRODUCT_OLICOM_OC2183,
+	    "OC2183",
+	},
+	{
 	    PCI_VENDOR_OLICOM, PCI_PRODUCT_OLICOM_OC2326,
 	    "OC2326",
 	},
@@ -7807,58 +7807,18 @@ static const struct pci_known_product pci_known_products[] = {
 	    "I/O 9080",
 	},
 	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_DC5030,
-	    "DC5030",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20246,
-	    "PDC20246",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20262,
-	    "PDC20262",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20263,
-	    "PDC20263",
-	},
-	{
 	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20265,
 	    "PDC20265",
 	},
 	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20267,
-	    "PDC20267",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20268,
-	    "PDC20268",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20268R,
-	    "PDC20268R",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20269,
-	    "PDC20269",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20271,
-	    "PDC20271",
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20263,
+	    "PDC20263",
 	},
 	{
 	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20275,
 	    "PDC20275",
 	},
 	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20276,
-	    "PDC20276",
-	},
-	{
-	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20277,
-	    "PDC20277",
-	},
-	{
 	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20318,
 	    "PDC20318",
 	},
@@ -7891,6 +7851,42 @@ static const struct pci_known_product pci_known_products[] = {
 	    "PDC20379",
 	},
 	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20267,
+	    "PDC20267",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20246,
+	    "PDC20246",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20262,
+	    "PDC20262",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20268,
+	    "PDC20268",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20269,
+	    "PDC20269",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20276,
+	    "PDC20276",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_DC5030,
+	    "DC5030",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20268R,
+	    "PDC20268R",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20271,
+	    "PDC20271",
+	},
+	{
 	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20617,
 	    "PDC20617",
 	},
@@ -7911,6 +7907,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "PDC20621",
 	},
 	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_PDC20277,
+	    "PDC20277",
+	},
+	{
 	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP10160,
 	    "ISP10160",
 	},
@@ -8579,14 +8579,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "7018 Audio",
 	},
 	{
-	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C665,
-	    "FDC 37C665",
-	},
-	{
-	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C922,
-	    "FDC 37C922",
-	},
-	{
 	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_83C170,
 	    "83C170 (EPIC/100)",
 	},
@@ -8595,6 +8587,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "83C175 (EPIC/100)",
 	},
 	{
+	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C665,
+	    "FDC 37C665",
+	},
+	{
+	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C922,
+	    "FDC 37C922",
+	},
+	{
 	    PCI_VENDOR_SMI, PCI_PRODUCT_SMI_SM710,
 	    "LynxEM",
 	},
@@ -9359,14 +9359,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "US201",
 	},
 	{
-	    PCI_VENDOR_USR, PCI_PRODUCT_USR_3CP5610,
-	    "3CP5610",
-	},
-	{
 	    PCI_VENDOR_USR2, PCI_PRODUCT_USR2_USR997902,
 	    "USR997902",
 	},
 	{
+	    PCI_VENDOR_USR, PCI_PRODUCT_USR_3CP5610,
+	    "3CP5610",
+	},
+	{
 	    PCI_VENDOR_USR2, PCI_PRODUCT_USR2_WL11000P,
 	    "WL11000P",
 	},
@@ -10151,14 +10151,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82C925",
 	},
 	{
-	    PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_VIRTUAL,
-	    "Virtual SVGA",
-	},
-	{
 	    PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_VIRTUAL2,
 	    "Virtual SVGA II",
 	},
 	{
+	    PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_VIRTUAL,
+	    "Virtual SVGA",
+	},
+	{
 	    PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_NET,
 	    "Virtual NIC",
 	},