regen

2 files changed, 242 insertions, 204 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 2a80272290f..48ac0975ddd 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.390 2008/08/27 17:33:32 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.391 2008/09/03 14:01:14 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.380 2008/08/27 17:33:30 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.381 2008/09/03 13:58:01 sthen Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -75,7 +75,6 @@
 #define	USB_VENDOR_MELCO	0x0411		/* Melco */
 #define	USB_VENDOR_LEADTEK	0x0413		/* Leadtek */
 #define	USB_VENDOR_CREATIVE	0x041e		/* Creative Labs */
-#define	USB_VENDOR_CREATIVE2	0x1292		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology */
 #define	USB_VENDOR_SMC2	0x0424		/* Standard Microsystems */
@@ -105,8 +104,8 @@
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
-#define	USB_VENDOR_KYOCERA	0x0482		/* Kyocera */
 #define	USB_VENDOR_PLANTRONICS	0x047f		/* Plantronics */
+#define	USB_VENDOR_KYOCERA	0x0482		/* Kyocera */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
@@ -235,7 +234,6 @@
 #define	USB_VENDOR_GUNZE	0x0637		/* Gunze Electronics USA */
 #define	USB_VENDOR_AVISION	0x0638		/* Avision */
 #define	USB_VENDOR_TEAC	0x0644		/* TEAC */
-#define	USB_VENDOR_ARKMICRO	0x6547		/* Arkmicro */
 #define	USB_VENDOR_SGI	0x065e		/* Silicon Graphics */
 #define	USB_VENDOR_SANWASUPPLY	0x0663		/* Sanwa Supply */
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
@@ -264,8 +262,8 @@
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
 #define	USB_VENDOR_ALCATELM	0x06e4		/* Alcatel Microelectronics */
 #define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
-#define	USB_VENDOR_BOSTON	0x06fd		/* Boston Acoustics */
 #define	USB_VENDOR_GUILLEMOT	0x06f8		/* Guillemot */
+#define	USB_VENDOR_BOSTON	0x06fd		/* Boston Acoustics */
 #define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems */
 #define	USB_VENDOR_PUTERCOM	0x0708		/* Putercom */
 #define	USB_VENDOR_MCT	0x0711		/* MCT */
@@ -414,9 +412,9 @@
 #define	USB_VENDOR_KYOCERA2	0x0c88		/* Kyocera */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
 #define	USB_VENDOR_ATHEROS2	0x0cf3		/* Atheros Communications */
+#define	USB_VENDOR_POSIFLEX	0x0d3a		/* Posiflex Technologies */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_KOBIL	0x0d46		/* Kobil Systems */
-#define	USB_VENDOR_POSIFLEX	0x0d3a		/* Posiflex Technologies */
 #define	USB_VENDOR_SMC3	0x0d5c		/* SMC */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_ABC	0x0d8c		/* ABC */
@@ -471,6 +469,7 @@
 #define	USB_VENDOR_TWINMOS	0x126f		/* TwinMOS */
 #define	USB_VENDOR_TENDA	0x1286		/* Tenda */
 #define	USB_VENDOR_TESTO	0x128d		/* Testo AG */
+#define	USB_VENDOR_CREATIVE2	0x1292		/* Creative Labs */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
 #define	USB_VENDOR_CYBERTAN	0x129b		/* CyberTAN Technology */
 #define	USB_VENDOR_HUAWEI	0x12d1		/* HUAWEI Technologies */
@@ -549,6 +548,7 @@
 #define	USB_VENDOR_ACERLABS2	0x5986		/* Acer */
 #define	USB_VENDOR_ZINWELL	0x5a57		/* Zinwell */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
+#define	USB_VENDOR_ARKMICRO	0x6547		/* Arkmicro */
 #define	USB_VENDOR_3COM2	0x6891		/* 3Com */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_SITECOM2	0x9016		/* Sitecom */
@@ -570,10 +570,14 @@
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 #define	USB_PRODUCT_3COM_3C460B	0x4601		/* HomeConnect 3C460B */
+
+/* 3Com(2) products */
+#define	USB_PRODUCT_3COM2_3CRUSB10075	0xa727		/* 3CRUSB10075 */
+
+/* 3Com(3) products */
 #define	USB_PRODUCT_3COM3_AR5523_1	0x6893		/* AR5523 */
 #define	USB_PRODUCT_3COM3_AR5523_2	0x6895		/* AR5523 */
 #define	USB_PRODUCT_3COM3_AR5523_3	0x6897		/* AR5523 */
-#define	USB_PRODUCT_3COM2_3CRUSB10075	0xa727		/* 3CRUSB10075 */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
 #define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
@@ -710,13 +714,14 @@
 #define	USB_PRODUCT_ALCATELT_ST120G	0x0120		/* SpeedTouch 120g */
 
 /* Alcor Micro, Inc. products */
-#define	USB_PRODUCT_ALCOR2_KBD_HUB	0x2802		/* Kbd Hub */
-
 #define	USB_PRODUCT_ALCOR_MA_KBD_HUB	0x9213		/* MacAlly Kbd Hub */
 #define	USB_PRODUCT_ALCOR_AU9814	0x9215		/* AU9814 Hub */
 #define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan */
 #define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
 
+/* Alcor Micro, Inc.(2) products */
+#define	USB_PRODUCT_ALCOR2_KBD_HUB	0x2802		/* Kbd Hub */
+
 /* Allied Telesyn International products */
 #define	USB_PRODUCT_ALLIEDTELESYN_ATUSB100	0xb100		/* AT-USB100 */
 
@@ -733,6 +738,8 @@
 
 /* AMIT products */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
+
+/* AMIT(2) products */
 #define	USB_PRODUCT_AMIT2_RT2870	0x0008		/* RT2870 */
 
 /* Analog Devices, Inc. products */
@@ -794,11 +801,11 @@
 #define	USB_PRODUCT_ASUS_RT2573_1	0x1723		/* RT2573 */
 #define	USB_PRODUCT_ASUS_RT2573_2	0x1724		/* RT2573 */
 #define	USB_PRODUCT_ASUS_WL159G	0x170c		/* WL-159g */
-#define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 #define	USB_PRODUCT_ASUS_A9T_WIFI	0x171b		/* A9T wireless */
 #define	USB_PRODUCT_ASUS_RT2870_1	0x1731		/* RT2870 */
 #define	USB_PRODUCT_ASUS_RT2870_2	0x1732		/* RT2870 */
 #define	USB_PRODUCT_ASUS_RT2870_3	0x1742		/* RT2870 */
+#define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 
 /* ASUSTeK Computer products */
 #define	USB_PRODUCT_ASUSTEK_WL140	0x3300		/* WL-140 */
@@ -814,6 +821,8 @@
 /* Atheros Communications products */
 #define	USB_PRODUCT_ATHEROS_AR5523	0x0001		/* AR5523 */
 #define	USB_PRODUCT_ATHEROS_AR5523_NF	0x0002		/* AR5523 */
+
+/* Atheros Communications(2) products */
 #define	USB_PRODUCT_ATHEROS2_AR5523_1	0x0001		/* AR5523 */
 #define	USB_PRODUCT_ATHEROS2_AR5523_1_NF	0x0002		/* AR5523 */
 #define	USB_PRODUCT_ATHEROS2_AR5523_2	0x0003		/* AR5523 */
@@ -876,7 +885,6 @@
 
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet */
-#define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel */
 #define	USB_PRODUCT_BELKIN_F5D6050	0x0050		/* F5D6050 802.11b Wireless adapter */
 #define	USB_PRODUCT_BELKIN_FBT001V	0x0081		/* Bluetooth */
 #define	USB_PRODUCT_BELKIN_F8T003V	0x0083		/* Bluetooth */
@@ -890,17 +898,20 @@
 #define	USB_PRODUCT_BELKIN_F5U257	0x0257		/* F5U257 Serial */
 #define	USB_PRODUCT_BELKIN_F5U409	0x0409		/* F5U409 Serial */
 #define	USB_PRODUCT_BELKIN_F6C550AVR	0x0551		/* F6C550-AVR UPS */
+#define	USB_PRODUCT_BELKIN_F6C1500EITWRK	0x0751		/* F6C1500EITW-RK UPS */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
 #define	USB_PRODUCT_BELKIN_F5D5055	0x5055		/* F5D5055 */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
-#define	USB_PRODUCT_BELKIN_F6C1500EITWRK	0x0751		/* F6C1500EITW-RK UPS */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_RT2870	0x8053		/* RT2870 */
 #define	USB_PRODUCT_BELKIN_F5D9050C	0x905c		/* F5D9050C */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 */
 
+/* Belkin(2) products */
+#define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel */
+
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 Ethernet */
 #define	USB_PRODUCT_BILLIONTON_USBLP100	0x0987		/* USB100LP */
@@ -971,10 +982,10 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54G	0x000d		/* RT2570 */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GP	0x0011		/* RT2570 */
 #define	USB_PRODUCT_CISCOLINKSYS_USB200MV2	0x0018		/* USB200M v2 */
+#define	USB_PRODUCT_CISCOLINKSYS_HU200TS	0x001a		/* HU200-TS */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GC	0x0020		/* WUSB54GC */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
-#define	USB_PRODUCT_CISCOLINKSYS_HU200TS	0x001a		/* HU200-TS */
 
 /* Clipsal products */
 #define	USB_PRODUCT_CLIPSAL_5500PCU	0x0303		/* 5500PCU C-Bus */
@@ -1004,6 +1015,8 @@
 #define	USB_PRODUCT_CONCEPTRONIC_AR5523_1_NF	0x7802		/* AR5523 */
 #define	USB_PRODUCT_CONCEPTRONIC_AR5523_2	0x7811		/* AR5523 */
 #define	USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF	0x7812		/* AR5523 */
+
+/* Conceptronic(2) products */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU	0x3c02		/* C54RU WLAN */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU2	0x3c22		/* C54RU */
 #define	USB_PRODUCT_CONCEPTRONIC2_RT2870_1	0x3c06		/* RT2870 */
@@ -1052,6 +1065,7 @@
 #define	USB_PRODUCT_CYBERPOWER_1500	0x0501		/* 1500 */
 
 /* CyberTAN Technology products */
+#define	USB_PRODUCT_CYBERTAN_GIGASET108	0x160c		/* Siemens Gigaset 108 */
 #define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
 #define	USB_PRODUCT_CYBERTAN_RT2870	0x1828		/* RT2870 */
 
@@ -1070,12 +1084,12 @@
 #define	USB_PRODUCT_DAISY_DMC	0x6901		/* PhotoClip */
 
 /* Dallas Semiconductor products */
-#define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 #define	USB_PRODUCT_DALLAS_USB_FOB_IBUTTON	0x2490		/* USB-FOB/iBUTTON */
+#define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 
 /* Davicom products */
-#define	USB_PRODUCT_DAVICOM_DM9601	0x9601		/* DM9601 */
 #define	USB_PRODUCT_DAVICOM_WK668	0x0668		/* HenTong WK-668 */
+#define	USB_PRODUCT_DAVICOM_DM9601	0x9601		/* DM9601 */
 
 /* Dell products */
 #define	USB_PRODUCT_DELL_AXIM	0x4005		/* Axim X51v */
@@ -1111,7 +1125,6 @@
 
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial */
-#define	USB_PRODUCT_DLINK3_KVM221	0x020f		/* KVM-221 */
 #define	USB_PRODUCT_DLINK_DUBE100	0x1a00		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DWL120E	0x3200		/* DWL-120 rev E */
@@ -1125,12 +1138,7 @@
 #define	USB_PRODUCT_DLINK_DWLAG122	0x3a04		/* DWL-AG122 */
 #define	USB_PRODUCT_DLINK_DWLAG122_NF	0x3a05		/* DWL-AG122 */
 #define	USB_PRODUCT_DLINK_RT2570	0x3c00		/* RT2570 */
-#define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
-#define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
 #define	USB_PRODUCT_DLINK_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
-#define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
-#define	USB_PRODUCT_DLINK2_DWA110	0x3c07		/* DWA-110 */
-#define	USB_PRODUCT_DLINK2_RT2870	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet */
@@ -1139,6 +1147,16 @@
 #define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 ethernet */
 
+/* D-Link(2) products */
+#define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
+#define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
+#define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
+#define	USB_PRODUCT_DLINK2_DWA110	0x3c07		/* DWA-110 */
+#define	USB_PRODUCT_DLINK2_RT2870	0x3c09		/* RT2870 */
+
+/* D-Link(3) products */
+#define	USB_PRODUCT_DLINK3_KVM221	0x020f		/* KVM-221 */
+
 /* DMI products */
 #define	USB_PRODUCT_DMI_SA2_0	0xb001		/* Storage Adapter */
 
@@ -1258,11 +1276,10 @@
 #define	USB_PRODUCT_FTDI_FT232_5	0x6008		/* Serial */
 #define	USB_PRODUCT_FTDI_FT232_6	0x6009		/* Serial */
 #define	USB_PRODUCT_FTDI_SERIAL_2232C	0x6010		/* 2232C Serial */
-#define	USB_PRODUCT_FTDI_SERIAL_2232L	0xcff8		/* 2232L Serial */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
-#define	USB_PRODUCT_FTDI_DMX4ALL	0xc850		/* DMX4ALL DMX interface */
 #define	USB_PRODUCT_FTDI_LOCOBUFFER	0xc7d0		/* RR-CirKits LocoBuffer */
+#define	USB_PRODUCT_FTDI_DMX4ALL	0xc850		/* DMX4ALL DMX interface */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_1	0xc990		/* ASK RDR 4X7 */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_2	0xc991		/* ASK RDR 4X7 */
 #define	USB_PRODUCT_FTDI_ASK_RDR4X7_3	0xc992		/* ASK RDR 4X7 */
@@ -1276,6 +1293,7 @@
 #define	USB_PRODUCT_FTDI_OPENPORT_13M	0xcc48		/* OpenPort 1.3 Mitsubishi */
 #define	USB_PRODUCT_FTDI_OPENPORT_13S	0xcc49		/* OpenPort 1.3 Subaru */
 #define	USB_PRODUCT_FTDI_OPENPORT_13U	0xcc4a		/* OpenPort 1.3 Universal */
+#define	USB_PRODUCT_FTDI_SERIAL_2232L	0xcff8		/* 2232L Serial */
 #define	USB_PRODUCT_FTDI_IPLUS	0xd070		/* iPlus */
 #define	USB_PRODUCT_FTDI_XSENS_1	0xd388		/* Serial */
 #define	USB_PRODUCT_FTDI_XSENS_2	0xd389		/* Serial */
@@ -1535,14 +1553,14 @@
 #define	USB_PRODUCT_HP_816C	0x0804		/* DeskJet 816C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
 #define	USB_PRODUCT_HP_5400C	0x1005		/* Scanjet 5400C */
+#define	USB_PRODUCT_HP_2215	0x1016		/* iPAQ 22xx/Jornada 548 */
 #define	USB_PRODUCT_HP_959C	0x1104		/* Deskjet 959C */
+#define	USB_PRODUCT_HP_568J	0x1116		/* Jornada 568 */
 #define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
 #define	USB_PRODUCT_HP_P2000U	0x1801		/* Inkjet P-2000U */
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 #define	USB_PRODUCT_HP_HN210E	0x811c		/* HN210E Ethernet */
-#define	USB_PRODUCT_HP_2215	0x1016		/* iPAQ 22xx/Jornada 548 */
-#define	USB_PRODUCT_HP_568J	0x1116		/* Jornada 568 */
 
 /* HP products */
 #define	USB_PRODUCT_HP2_C500	0x6002		/* PhotoSmart C500 */
@@ -1813,6 +1831,7 @@
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO3K	0x08b0		/* QuickCam Pro 3000 */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMNBPRO_1	0x08b1		/* QuickCam Notebook Pro */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO4K	0x08b2		/* QuickCam Pro 4000 */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMZOOM	0x08b3		/* QuickCam Zoom */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMFUSION_1	0x08c1		/* QuickCam Fusion */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMORBITMP_1	0x08c2		/* QuickCam Orbit MP */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMNBPRO	0x08c3		/* QuickCam Notebook Pro */
@@ -1848,7 +1867,6 @@
 #define	USB_PRODUCT_LOGITECH_RB6	0xc503		/* Cordless keyboard */
 #define	USB_PRODUCT_LOGITECH_CDO	0xc504		/* Cordless Desktop Optical */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
-#define	USB_PRODUCT_LOGITECH_QUICKCAMZOOM	0x08b3		/* QuickCam Zoom */
 
 /* Longshine products */
 #define	USB_PRODUCT_ABOCOM_LCS8138TX	0x401a		/* LCS-8138TX */
@@ -1984,11 +2002,15 @@
 
 /* Motorola products */
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
+
+/* Motorola(2) products */
 #define	USB_PRODUCT_MOTOROLA2_T720C	0x2822		/* T720c */
 #define	USB_PRODUCT_MOTOROLA2_V360	0x4902		/* V360 */
 #define	USB_PRODUCT_MOTOROLA2_USBLAN	0x600c		/* USBLAN */
 #define	USB_PRODUCT_MOTOROLA2_USBLAN2	0x6027		/* USBLAN */
-#define	USB_PRODUCT_MOTOROLA_SB4100	0x4100		/* SB4100 Cable Modem */
+
+/* Motorola(3) products */
+#define	USB_PRODUCT_MOTOROLA3_SB4100	0x4100		/* SB4100 Cable Modem */
 #define	USB_PRODUCT_MOTOROLA3_SB5100	0x5100		/* SB5100 Cable Modem */
 
 /* MultiTech products */
@@ -2044,18 +2066,22 @@
 #define	USB_PRODUCT_NETGEAR_EA101X	0x1002		/* Ethernet */
 #define	USB_PRODUCT_NETGEAR_FA101	0x1020		/* 10/100 Ethernet */
 #define	USB_PRODUCT_NETGEAR_FA120	0x1040		/* USB 2.0 Fast Ethernet */
-#define	USB_PRODUCT_NETGEAR2_MA101	0x4100		/* MA101 */
-#define	USB_PRODUCT_NETGEAR2_MA101B	0x4102		/* MA101 Rev B */
 #define	USB_PRODUCT_NETGEAR_MA111NA	0x4110		/* 802.11b */
 #define	USB_PRODUCT_NETGEAR_MA111V2	0x4230		/* 802.11b V2 */
 #define	USB_PRODUCT_NETGEAR_WG111V2_2	0x4240		/* PrismGT USB 2.0 WLAN */
-#define	USB_PRODUCT_NETGEAR3_WG111T	0x4250		/* WG111T */
-#define	USB_PRODUCT_NETGEAR3_WG111T_NF	0x4251		/* WG111T */
 #define	USB_PRODUCT_NETGEAR_WG111U	0x4300		/* WG111U */
 #define	USB_PRODUCT_NETGEAR_WG111U_NF	0x4301		/* WG111U */
+#define	USB_PRODUCT_NETGEAR_WG111V2	0x6a00		/* WG111v2 */
+
+/* Netgear(2) products */
+#define	USB_PRODUCT_NETGEAR2_MA101	0x4100		/* MA101 */
+#define	USB_PRODUCT_NETGEAR2_MA101B	0x4102		/* MA101 Rev B */
+
+/* Netgear(3) products */
+#define	USB_PRODUCT_NETGEAR3_WG111T	0x4250		/* WG111T */
+#define	USB_PRODUCT_NETGEAR3_WG111T_NF	0x4251		/* WG111T */
 #define	USB_PRODUCT_NETGEAR3_WPN111	0x5f00		/* WPN111 */
 #define	USB_PRODUCT_NETGEAR3_WPN111_NF	0x5f01		/* WPN111 */
-#define	USB_PRODUCT_NETGEAR_WG111V2	0x6a00		/* WG111v2 */
 
 /* Nikon products */
 #define	USB_PRODUCT_NIKON_E990	0x0102		/* E990 */
@@ -2073,7 +2099,6 @@
 #define	USB_PRODUCT_NOVATECH_RT2573	0x9021		/* RT2573 */
 
 /* Novatel Wireless products */
-#define	USB_PRODUCT_NOVATEL1_FLEXPACKGPS	0x0100		/* NovAtel FlexPack GPS */
 #define	USB_PRODUCT_NOVATEL_EXPRESSCARD	0x1100		/* ExpressCard 3G */
 #define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* Merlin V620 */
 #define	USB_PRODUCT_NOVATEL_S720	0x1130		/* S720 */
@@ -2082,6 +2107,9 @@
 #define	USB_PRODUCT_NOVATEL_ES620	0x2100		/* ES620 CDMA */
 #define	USB_PRODUCT_NOVATEL_U720	0x2110		/* U720 */
 
+/* Novatel Wireless(1) products */
+#define	USB_PRODUCT_NOVATEL1_FLEXPACKGPS	0x0100		/* NovAtel FlexPack GPS */
+
 #define	USB_PRODUCT_OLIMEX_OPENOCD_JTAG	0x0003		/* OpenOCD JTAG */
 
 /* Olympus products */
@@ -2110,6 +2138,7 @@
 #define	USB_PRODUCT_ONSPEC_LC1	0xa109		/* CF + SM Combo (LC1) */
 #define	USB_PRODUCT_ONSPEC_MD1II	0xb006		/* Datafab MD1-II PC-Card */
 
+/* OnSpec Electronic, Inc.(2) */
 #define	USB_PRODUCT_ONSPEC2_8IN2	0xb012		/* 8In2 */
 
 /* OQO */
@@ -2272,13 +2301,15 @@
 #define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host */
 #define	USB_PRODUCT_PROLIFIC_RSAQ2	0x04bb		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2303	0x2303		/* PL2303 Serial */
-#define	USB_PRODUCT_PROLIFIC2_PL2303	0x2303		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2305	0x2305		/* Parallel printer */
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
 #define	USB_PRODUCT_PROLIFIC_PL2501	0x2501		/* PL2501 Host-Host */
 #define	USB_PRODUCT_PROLIFIC_PL2303X	0xaaa0		/* PL2303 Serial */
 #define	USB_PRODUCT_PROLIFIC_PL2303X2	0xaaa2		/* PL2303 Serial */
 
+/* Prolific(2) products */
+#define	USB_PRODUCT_PROLIFIC2_PL2303	0x2303		/* PL2303 Serial */
+
 /* Putercom products */
 #define	USB_PRODUCT_PUTERCOM_UPA100	0x047e		/* USB-1284 BRIDGE */
 
@@ -2294,8 +2325,12 @@
 #define	USB_PRODUCT_QUALCOMM_MSM_DRIVER	0x1000		/* MSM driver */
 #define	USB_PRODUCT_QUALCOMM_MSM_MODEM	0x3196		/* CDMA MSM modem */
 #define	USB_PRODUCT_QUALCOMM_MSM_HSDPA2	0x6000		/* HSDPA MSM */
-#define	USB_PRODUCT_QUALCOMM2_MSM_PHONE	0x6000		/* CDMA MSM phone */
 #define	USB_PRODUCT_QUALCOMM_MSM_HSDPA	0x6613		/* HSDPA MSM */
+
+/* Qualcomm(2) products */
+#define	USB_PRODUCT_QUALCOMM2_MSM_PHONE	0x6000		/* CDMA MSM phone */
+
+/* Qualcomm(3) products */
 #define	USB_PRODUCT_QUALCOMM3_CDMA_MSM	0x0001		/* CDMA Technologies MSM modem */
 
 /* Quickshot products */
@@ -2310,12 +2345,12 @@
 /* Ralink Technology products */
 #define	USB_PRODUCT_RALINK_RT2570	0x1706		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2570_2	0x2570		/* RT2570 */
-#define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
-#define	USB_PRODUCT_RALINK_RT2573_2	0x9021		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2770	0x2770		/* RT2770 */
 #define	USB_PRODUCT_RALINK_RT2870	0x2870		/* RT2870 */
+#define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
+#define	USB_PRODUCT_RALINK_RT2573_2	0x9021		/* RT2573 */
 
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
@@ -2448,9 +2483,9 @@
 
 /* ShanTou products */
 #define	USB_PRODUCT_SHANTOU_ST268	0x0268		/* ST268 */
-#define	USB_PRODUCT_SHANTOU_DM9601	0x9601		/* DM9601 */
 #define	USB_PRODUCT_SHANTOU_ZT6688	0x6688		/* ZT6688 */
 #define	USB_PRODUCT_SHANTOU_ADM8515	0x8515		/* ADM8515 Ethernet */
+#define	USB_PRODUCT_SHANTOU_DM9601	0x9601		/* DM9601 */
 
 /* Shark products */
 #define	USB_PRODUCT_SHARK_PA	0x0400		/* Pocket Adapter */
@@ -2477,14 +2512,17 @@
 #define	USB_PRODUCT_SHUTTLE_SCM	0x1010		/* SCM Micro */
 
 /* Siemens products */
+#define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream */
+#define	USB_PRODUCT_SIEMENS_SPEEDSTREAM22	0x1022		/* SpeedStream 1022 */
+
+/* Siemens(2) products */
+#define	USB_PRODUCT_SIEMENS2_WLL013	0x001b		/* WLL013 */
+#define	USB_PRODUCT_SIEMENS2_ES75	0x0034		/* GSM module MC35 */
+
+/* Siemens(3) products */
 #define	USB_PRODUCT_SIEMENS3_SX1	0x0001		/* SX1 */
 #define	USB_PRODUCT_SIEMENS3_X65	0x0003		/* X65 */
 #define	USB_PRODUCT_SIEMENS3_X75	0x0004		/* X75 */
-#define	USB_PRODUCT_SIEMENS2_WLL013	0x001b		/* WLL013 */
-#define	USB_PRODUCT_SIEMENS2_ES75	0x0034		/* GSM module MC35 */
-#define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream */
-#define	USB_PRODUCT_SIEMENS_SPEEDSTREAM22	0x1022		/* SpeedStream 1022 */
-#define	USB_PRODUCT_CYBERTAN_GIGASET108	0x160c		/* Siemens Gigaset 108 */
 
 /* Sierra Wireless products */
 #define	USB_PRODUCT_SIERRA_EM5625	0x0017		/* EM5625 */
@@ -2726,8 +2764,8 @@
 /* Texas Intel products */
 #define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 #define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
-#define	USB_PRODUCT_TI_NEXII	0x5409		/* Nex II Digital */
 #define	USB_PRODUCT_TI_TUSB3410	0x3410		/* TUSB3410 */
+#define	USB_PRODUCT_TI_NEXII	0x5409		/* Nex II Digital */
 
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index fd712c69149..aa23a8252e9 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.384 2008/08/27 17:33:33 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.385 2008/09/03 14:01:14 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.380 2008/08/27 17:33:30 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.381 2008/09/03 13:58:01 sthen Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -82,6 +82,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "HomeConnect 3C460B",
 	},
 	{
+	    USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075,
+	    "3CRUSB10075",
+	},
+	{
 	    USB_VENDOR_3COM3, USB_PRODUCT_3COM3_AR5523_1,
 	    "AR5523",
 	},
@@ -94,10 +98,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075,
-	    "3CRUSB10075",
-	},
-	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
 	    "3Com OfficeConnect Analog Modem",
 	},
@@ -434,10 +434,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "SpeedTouch 120g",
 	},
 	{
-	    USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB,
-	    "Kbd Hub",
-	},
-	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB,
 	    "MacAlly Kbd Hub",
 	},
@@ -454,6 +450,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "NEC Kbd Hub",
 	},
 	{
+	    USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB,
+	    "Kbd Hub",
+	},
+	{
 	    USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100,
 	    "AT-USB100",
 	},
@@ -630,10 +630,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "WL-159g",
 	},
 	{
-	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_MYPAL_A730,
-	    "MyPal A730",
-	},
-	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A9T_WIFI,
 	    "A9T wireless",
 	},
@@ -650,6 +646,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_MYPAL_A730,
+	    "MyPal A730",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL140,
 	    "WL-140",
 	},
@@ -834,10 +834,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "Card reader",
 	},
 	{
-	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
-	    "F5U002 Parallel",
-	},
-	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D6050,
 	    "F5D6050 802.11b Wireless adapter",
 	},
@@ -890,6 +886,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F6C550-AVR UPS",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,
+	    "F6C1500EITW-RK UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120,
 	    "F5U120-PC Hub",
 	},
@@ -906,10 +906,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5D7050 54g USB Network Adapter",
 	},
 	{
-	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,
-	    "F6C1500EITW-RK UPS",
-	},
-	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A,
 	    "F5D705A 54g USB Network Adapter",
 	},
@@ -930,6 +926,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5D9050 ver 3",
 	},
 	{
+	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
+	    "F5U002 Parallel",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    "USB100N 10/100 Ethernet",
 	},
@@ -1102,6 +1102,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB200M v2",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS,
+	    "HU200-TS",
+	},
+	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC,
 	    "WUSB54GC",
 	},
@@ -1114,10 +1118,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "WUSBF54G",
 	},
 	{
-	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS,
-	    "HU200-TS",
-	},
-	{
 	    USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5500PCU,
 	    "5500PCU C-Bus",
 	},
@@ -1322,6 +1322,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "1500",
 	},
 	{
+	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_GIGASET108,
+	    "Siemens Gigaset 108",
+	},
+	{
 	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB,
 	    "TG54USB",
 	},
@@ -1370,22 +1374,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "PhotoClip",
 	},
 	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
-	    "J-6502 speakers",
-	},
-	{
 	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
 	    "USB-FOB/iBUTTON",
 	},
 	{
-	    USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_DM9601,
-	    "DM9601",
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    "J-6502 speakers",
 	},
 	{
 	    USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_WK668,
 	    "HenTong WK-668",
 	},
 	{
+	    USB_VENDOR_DAVICOM, USB_PRODUCT_DAVICOM_DM9601,
+	    "DM9601",
+	},
+	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_AXIM,
 	    "Axim X51v",
 	},
@@ -1466,10 +1470,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "PS/2 Active",
 	},
 	{
-	    USB_VENDOR_DLINK3, USB_PRODUCT_DLINK3_KVM221,
-	    "KVM-221",
-	},
-	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100,
 	    "10/100 ethernet",
 	},
@@ -1522,30 +1522,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1,
-	    "DWL-G122 rev C1",
-	},
-	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340,
-	    "WUA-1340",
-	},
-	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1,
 	    "DUB-E100 rev B1",
 	},
 	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111,
-	    "DWA-111",
-	},
-	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110,
-	    "DWA-110",
-	},
-	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870,
-	    "RT2870",
-	},
-	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    "10Mbps ethernet",
 	},
@@ -1574,6 +1554,30 @@ const struct usb_known_product usb_known_products[] = {
 	    "10/100 ethernet",
 	},
 	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1,
+	    "DWL-G122 rev C1",
+	},
+	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340,
+	    "WUA-1340",
+	},
+	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111,
+	    "DWA-111",
+	},
+	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110,
+	    "DWA-110",
+	},
+	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_DLINK3, USB_PRODUCT_DLINK3_KVM221,
+	    "KVM-221",
+	},
+	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
 	    "Storage Adapter",
 	},
@@ -1878,10 +1882,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "2232C Serial",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232L,
-	    "2232L Serial",
-	},
-	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
 	    "PS/2 Keyboard/Mouse",
 	},
@@ -1890,14 +1890,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Serial",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DMX4ALL,
-	    "DMX4ALL DMX interface",
-	},
-	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LOCOBUFFER,
 	    "RR-CirKits LocoBuffer",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DMX4ALL,
+	    "DMX4ALL DMX interface",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_ASK_RDR4X7_1,
 	    "ASK RDR 4X7",
 	},
@@ -1950,6 +1950,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "OpenPort 1.3 Universal",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232L,
+	    "2232L Serial",
+	},
+	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_IPLUS,
 	    "iPlus",
 	},
@@ -2778,10 +2782,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Scanjet 5400C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_2215,
+	    "iPAQ 22xx/Jornada 548",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_959C,
 	    "Deskjet 959C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_568J,
+	    "Jornada 568",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
 	    "DeskJet 930c",
 	},
@@ -2802,14 +2814,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "HN210E Ethernet",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_2215,
-	    "iPAQ 22xx/Jornada 548",
-	},
-	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_568J,
-	    "Jornada 568",
-	},
-	{
 	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
 	    "PhotoSmart C500",
 	},
@@ -3538,6 +3542,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "QuickCam Pro 4000",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMZOOM,
+	    "QuickCam Zoom",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMFUSION_1,
 	    "QuickCam Fusion",
 	},
@@ -3678,10 +3686,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "QuickCam Pro",
 	},
 	{
-	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMZOOM,
-	    "QuickCam Zoom",
-	},
-	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_LCS8138TX,
 	    "LCS-8138TX",
 	},
@@ -4062,7 +4066,7 @@ const struct usb_known_product usb_known_products[] = {
 	    "USBLAN",
 	},
 	{
-	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_SB4100,
+	    USB_VENDOR_MOTOROLA3, USB_PRODUCT_MOTOROLA3_SB4100,
 	    "SB4100 Cable Modem",
 	},
 	{
@@ -4206,14 +4210,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB 2.0 Fast Ethernet",
 	},
 	{
-	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
-	    "MA101",
-	},
-	{
-	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B,
-	    "MA101 Rev B",
-	},
-	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
 	    "802.11b",
 	},
@@ -4226,14 +4222,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "PrismGT USB 2.0 WLAN",
 	},
 	{
-	    USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T,
-	    "WG111T",
-	},
-	{
-	    USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T_NF,
-	    "WG111T",
-	},
-	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111U,
 	    "WG111U",
 	},
@@ -4242,6 +4230,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "WG111U",
 	},
 	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111V2,
+	    "WG111v2",
+	},
+	{
+	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
+	    "MA101",
+	},
+	{
+	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B,
+	    "MA101 Rev B",
+	},
+	{
+	    USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T,
+	    "WG111T",
+	},
+	{
+	    USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T_NF,
+	    "WG111T",
+	},
+	{
 	    USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WPN111,
 	    "WPN111",
 	},
@@ -4250,10 +4258,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "WPN111",
 	},
 	{
-	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111V2,
-	    "WG111v2",
-	},
-	{
 	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
 	    "E990",
 	},
@@ -4282,10 +4286,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
-	    USB_VENDOR_NOVATEL1, USB_PRODUCT_NOVATEL1_FLEXPACKGPS,
-	    "NovAtel FlexPack GPS",
-	},
-	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_EXPRESSCARD,
 	    "ExpressCard 3G",
 	},
@@ -4314,6 +4314,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "U720",
 	},
 	{
+	    USB_VENDOR_NOVATEL1, USB_PRODUCT_NOVATEL1_FLEXPACKGPS,
+	    "NovAtel FlexPack GPS",
+	},
+	{
 	    USB_VENDOR_OLIMEX, USB_PRODUCT_OLIMEX_OPENOCD_JTAG,
 	    "OpenOCD JTAG",
 	},
@@ -4862,10 +4866,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "PL2303 Serial",
 	},
 	{
-	    USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_PL2303,
-	    "PL2303 Serial",
-	},
-	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305,
 	    "Parallel printer",
 	},
@@ -4886,6 +4886,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "PL2303 Serial",
 	},
 	{
+	    USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_PL2303,
+	    "PL2303 Serial",
+	},
+	{
 	    USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100,
 	    "USB-1284 BRIDGE",
 	},
@@ -4918,14 +4922,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "HSDPA MSM",
 	},
 	{
-	    USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_MSM_PHONE,
-	    "CDMA MSM phone",
-	},
-	{
 	    USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA,
 	    "HSDPA MSM",
 	},
 	{
+	    USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_MSM_PHONE,
+	    "CDMA MSM phone",
+	},
+	{
 	    USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_CDMA_MSM,
 	    "CDMA Technologies MSM modem",
 	},
@@ -4950,10 +4954,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
-	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
-	    "RT2570",
-	},
-	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573,
 	    "RT2573",
 	},
@@ -4962,10 +4962,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2671",
 	},
 	{
-	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573_2,
-	    "RT2573",
-	},
-	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2770,
 	    "RT2770",
 	},
@@ -4974,6 +4970,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
+	    "RT2570",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573_2,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    "USB serial REX-USB60",
 	},
@@ -5358,10 +5362,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "ST268",
 	},
 	{
-	    USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_DM9601,
-	    "DM9601",
-	},
-	{
 	    USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ZT6688,
 	    "ZT6688",
 	},
@@ -5370,6 +5370,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ADM8515 Ethernet",
 	},
 	{
+	    USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_DM9601,
+	    "DM9601",
+	},
+	{
 	    USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA,
 	    "Pocket Adapter",
 	},
@@ -5442,16 +5446,12 @@ const struct usb_known_product usb_known_products[] = {
 	    "SCM Micro",
 	},
 	{
-	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_SX1,
-	    "SX1",
-	},
-	{
-	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X65,
-	    "X65",
+	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
+	    "SpeedStream",
 	},
 	{
-	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X75,
-	    "X75",
+	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM22,
+	    "SpeedStream 1022",
 	},
 	{
 	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WLL013,
@@ -5462,16 +5462,16 @@ const struct usb_known_product usb_known_products[] = {
 	    "GSM module MC35",
 	},
 	{
-	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
-	    "SpeedStream",
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_SX1,
+	    "SX1",
 	},
 	{
-	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM22,
-	    "SpeedStream 1022",
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X65,
+	    "X65",
 	},
 	{
-	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_GIGASET108,
-	    "Siemens Gigaset 108",
+	    USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X75,
+	    "X75",
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625,
@@ -6090,14 +6090,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "TUSB2046 hub",
 	},
 	{
-	    USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
-	    "Nex II Digital",
-	},
-	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_TUSB3410,
 	    "TUSB3410",
 	},
 	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
+	    "Nex II Digital",
+	},
+	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
 	    "Fusion Digital Gamepad",
 	},
@@ -6662,10 +6662,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Creative Labs",
 	},
 	{
-	    USB_VENDOR_CREATIVE2,
-	    "Creative Labs",
-	},
-	{
 	    USB_VENDOR_ADI,
 	    "ADI Systems",
 	},
@@ -6782,14 +6778,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Lucent",
 	},
 	{
-	    USB_VENDOR_KYOCERA,
-	    "Kyocera",
-	},
-	{
 	    USB_VENDOR_PLANTRONICS,
 	    "Plantronics",
 	},
 	{
+	    USB_VENDOR_KYOCERA,
+	    "Kyocera",
+	},
+	{
 	    USB_VENDOR_STMICRO,
 	    "STMicroelectronics",
 	},
@@ -7302,10 +7298,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "TEAC",
 	},
 	{
-	    USB_VENDOR_ARKMICRO,
-	    "Arkmicro",
-	},
-	{
 	    USB_VENDOR_SGI,
 	    "Silicon Graphics",
 	},
@@ -7418,14 +7410,14 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sirius Technologies",
 	},
 	{
-	    USB_VENDOR_BOSTON,
-	    "Boston Acoustics",
-	},
-	{
 	    USB_VENDOR_GUILLEMOT,
 	    "Guillemot",
 	},
 	{
+	    USB_VENDOR_BOSTON,
+	    "Boston Acoustics",
+	},
+	{
 	    USB_VENDOR_SMC,
 	    "Standard Microsystems",
 	},
@@ -8018,6 +8010,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Atheros Communications",
 	},
 	{
+	    USB_VENDOR_POSIFLEX,
+	    "Posiflex Technologies",
+	},
+	{
 	    USB_VENDOR_TANGTOP,
 	    "Tangtop",
 	},
@@ -8026,10 +8022,6 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Kobil Systems",
 	},
 	{
-	    USB_VENDOR_POSIFLEX,
-	    "Posiflex Technologies",
-	},
-	{
 	    USB_VENDOR_SMC3,
 	    "SMC",
 	},
@@ -8246,6 +8238,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Testo AG",
 	},
 	{
+	    USB_VENDOR_CREATIVE2,
+	    "Creative Labs",
+	},
+	{
 	    USB_VENDOR_BELKIN2,
 	    "Belkin Components",
 	},
@@ -8558,6 +8554,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Sitecom",
 	},
 	{
+	    USB_VENDOR_ARKMICRO,
+	    "Arkmicro",
+	},
+	{
 	    USB_VENDOR_3COM2,
 	    "3Com",
 	},