Regen.

2 files changed, 625 insertions, 507 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index a2a7c4a..c89fbdd 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.8 2000/01/13 20:13:58 wpaul Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.9 2000/01/20 07:38:32 wpaul Exp 
  */
 
 /*
@@ -109,20 +109,24 @@
 #define	USB_VENDOR_KLSI	0x05e9		/* Kawasaki LSI */
 #define	USB_VENDOR_PIENGINEERING	0x05f3		/* P.I. Engineering */
 #define	USB_VENDOR_CHIC	0x05fe		/* Chic Technology */
+#define	USB_VENDOR_SOLIDYEAR	0x060b		/* Solid Year */
 #define	USB_VENDOR_MACALLY	0x0618		/* Macally */
-#define	USB_VENDOR_LINKSYS	0x066B		/* LinkSys */
+#define	USB_VENDOR_LINKSYS	0x066b		/* Linksys Inc. */
 #define	USB_VENDOR_MULTITECH	0x06e0		/* MultiTech */
 #define	USB_VENDOR_ADS	0x06e1		/* ADS Technologies */
+#define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
 #define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems Corp */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
 #define	USB_VENDOR_ADMTEK	0x07a6		/* ADMtek Inc. */
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_SIIG	0x07cc		/* SIIG */
+#define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics Inc. */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring Inc. */
-#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
+#define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR Inc. */
-#define	USB_VENDOR_BILLIONTON	0x08DD		/* Billionton Systems */
+#define	USB_VENDOR_ACTIVEWIRE	0x0854		/* ActiveWire Inc. */
+#define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems Inc. */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -134,187 +138,176 @@
  * List of known products.  Grouped by vendor.
  */
 
-/* AOX Inc. products */
-#define	USB_PRODUCT_AOX_USB101	0x0008		/* USB ethernet controller engine */
+/* 3Com products */
+#define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect USB Camera */
+#define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet adapter */
+#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
-/* HP products */
-#define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
-#define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
 
-/* NEC products */
-#define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
-#define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
+/* Acer products */
+#define	USB_PRODUCT_ACER_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
 
-/* Kodak products */
-#define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
-#define	USB_PRODUCT_KODAK_DC240	0x0120		/* Digital Science DC240 */
-#define	USB_PRODUCT_KODAK_DC280	0x0130		/* Digital Science DC280 */
+/* ActiveWire Inc. products */
+#define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
+#define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 firmware */
 
-/* Melco products */
-#define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet adapter */
+/* ADMtek products */
+#define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 USB Ethernet adapter */
 
-/* CATC products */
-#define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
-#define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate ethernet adapter */
-#define	USB_PRODUCT_CATC_NETMATE2	0x000c		/* Netmate2 ethernet adapter */
-#define	USB_PRODUCT_CATC_CHIEF	0x000d		/* USB Chief Bus & Protocol Analyzer */
+/* ADS products */
+#define	USB_PRODUCT_ADS_UBS10BT	0x0008		/* UBS-10BT Ethernet adapter */
 
-/* Gravis products */
-#define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
+/* Agiler products */
+#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
 
-/* Sun Microsystems products */
-#define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
-/* XXX The above is a North American PC style keyboard possibly */
+/* AKS products */
+#define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
-/* Lexmark products */
-#define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
+/* Altec Lansing products */
+#define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
 
-/* Thrustmaster products */
-#define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
+/* American Power Conversion products */
+#define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
 
-/* Texas Intel products */
-#define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
+/* Anchor products */
+#define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 
-/* (KYE) Genius products */
-#define	USB_PRODUCT_KYE_NICHE	0x0001		/* Niche mouse */
-#define	USB_PRODUCT_KYE_FLIGHT2000	0x1004		/* Flight 2000 joystick */
+/* AOX Inc. products */
+#define	USB_PRODUCT_AOX_USB101	0x0008		/* USB ethernet controller engine */
 
-/* Microsoft products */
-#define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
-#define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural Keyboard Elite */
-#define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
+/* ATen products */
+#define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
+#define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps ethernet adapter */
 
-/* Primax products */
-#define	USB_PRODUCT_PRIMAX_COMFORT	0x4d01		/* Comfort */
-#define	USB_PRODUCT_PRIMAX_MOUSEINABOX	0x4d02		/* Mouse-in-a-Box */
+/* Belkin products */
+/*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
 
-/* Cherry products */
-#define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
-#define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
+/* Billionton products */
+#define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
+
+/* Brother Industries products */
+#define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
 
 /* Behavior Technology Computer products */
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
-/* Philips products */
-#define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
-#define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
-#define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
-#define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS XXX Digital Speaker System */
-
-/* Connectix products */
-#define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
-
-/* Lucent products */
-#define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
-
-/* STMicroelectronics products */
-#define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* USB Communicator */
-
-/* Acer products */
-#define	USB_PRODUCT_ACER_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
-
 /* Canon Inc. products */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 
-/* Cypress Semiconductor products */
-#define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
-#define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
-
-/* Epson products */
-#define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD USB Smart Cable for Mac */
-#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
-
-/* 3Com products */
-#define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
-
-/* Konica Corp. Products */
-#define	USB_PRODUCT_KONICA_CAMERA	0x0720		/* Digital Color Camera */
+/* CATC products */
+#define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate ethernet adapter */
+#define	USB_PRODUCT_CATC_NETMATE2	0x000c		/* Netmate2 ethernet adapter */
+#define	USB_PRODUCT_CATC_CHIEF	0x000d		/* USB Chief Bus & Protocol Analyzer */
+#define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
 
-/* Altec Lansing products */
-#define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
+/* Cherry products */
+#define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
+#define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
 
-/* Shuttle Technology products */
-#define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
+/* Chic Technology products */
+#define	USB_PRODUCT_CHIC_MOUSE1	0x0001		/* mouse */
 
 /* Chicony products */
 #define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
 
-/* Brother Industries products */
-#define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
-
-/* Dallas Semiconductor products */
-#define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
-
-/* 3Com products */
-#define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet adapter */
+/* Connectix products */
+#define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
 
-/* Kawatsu products */
-#define	USB_PRODUCT_KAWATSU_MH4000P	0x0003		/* MiniHub 4000P */
+/* Corega products */
+#define	USB_PRODUCT_COREGA_ETHER_USB_T	0x0001		/* Ether USB-T */
 
-/* American Power Conversion products */
-#define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
+/* Cypress Semiconductor products */
+#define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
+#define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
 
-/* NetChip Technology Products */
-#define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
+/* D-Link products */
+/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
+#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet adapter */
+#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet adapter */
+#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
 
-/* AKS products */
-#define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
+/* Dallas Semiconductor products */
+#define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 
-/* Universal Access products */
-#define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
+/* Diamond products */
+#define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 USB */
 
-/* Anchor products */
-#define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
+/* EIZO products */
+#define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
+#define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
 
-/* Vision products */
-#define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* VC6452V002 Camera */
+/* Elsa products */
+#define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA Modem Board */
 
-/* ATen products */
-#define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
-#define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps ethernet adapter */
+/* Entrega products */
+#define	USB_PRODUCT_ENTREGA_1S	0x0001		/* 1S serial connector */
+#define	USB_PRODUCT_ENTREGA_2S	0x0002		/* 2S serial connector */
+#define	USB_PRODUCT_ENTREGA_1S25	0x0003		/* 1S25 serial connector */
+#define	USB_PRODUCT_ENTREGA_4S	0x0004		/* 4S serial connector */
+#define	USB_PRODUCT_ENTREGA_E45	0x0005		/* E45 Ethernet adapter */
+#define	USB_PRODUCT_ENTREGA_CENTRONICS	0x0006		/* Centronics connector */
+#define	USB_PRODUCT_ENTREGA_1S9	0x0093		/* 1S9 serial connector */
+#define	USB_PRODUCT_ENTREGA_EZUSB	0x8000		/* EZ-USB */
+/*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+/*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
-/* Mustek products */
-#define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
+/* e-TEK Labs products */
+#define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
 
-/* Telex Communications products */
-#define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
+/* Epson products */
+#define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD USB Smart Cable for Mac */
+#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
 
-/* Peracom products */
-#define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
-#define	USB_PRODUCT_PERACOM_ENET	0x0002		/* Ethernet adapter */
-#define	USB_PRODUCT_PERACOM_ENET2	0x0005		/* Ethernet adapter */
+/* Gravis products */
+#define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
-/* Wacom products */
-#define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
+/* Handspring Inc. */
+#define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
-/* e-TEK Labs products */
-#define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
+/* HP products */
+#define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
+#define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
+#define	USB_PRODUCT_HP_5200	0x0401		/* Scanjet 5200 */
+#define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
+#define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
-/* EIZO products */
-#define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
-#define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
+/* Inside Out Networks products */
+#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
 
-/* Agiler products */
-#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
+/* In-System products */
+#define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
+#define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter */
 
-/* Rockfire products */
-#define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
+/* Intel products */
+#define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
 /* Iomega products */
 #define	USB_PRODUCT_IOMEGA_ZIP100	0x0001		/* Zip 100 */
 
-/* OmniVision Technologies Inc. products */
-#define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
+/* Kawatsu products */
+#define	USB_PRODUCT_KAWATSU_MH4000P	0x0003		/* MiniHub 4000P */
 
-/* In-System products */
-#define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
-#define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter */
+/* Kodak products */
+#define	USB_PRODUCT_KODAK_DC260	0x0110		/* Digital Science DC260 */
+#define	USB_PRODUCT_KODAK_DC265	0x0111		/* Digital Science DC265 */
+#define	USB_PRODUCT_KODAK_DC290	0x0111		/* Digital Science DC290 */
+#define	USB_PRODUCT_KODAK_DC240	0x0120		/* Digital Science DC240 */
+#define	USB_PRODUCT_KODAK_DC280	0x0130		/* Digital Science DC280 */
 
-/* Qtronix products */
-#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
+/* Konica Corp. Products */
+#define	USB_PRODUCT_KONICA_CAMERA	0x0720		/* Digital Color Camera */
 
-/* Elsa products */
-#define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA Modem Board */
+/* KYE products */
+#define	USB_PRODUCT_KYE_NICHE	0x0001		/* Niche mouse */
+#define	USB_PRODUCT_KYE_FLIGHT2000	0x1004		/* Flight 2000 joystick */
+
+/* Lexmark products */
+#define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
+
+/* Linksys products */
+#define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* USB100TX Ethernet */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
@@ -324,81 +317,116 @@
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
 
-/* P.I. Engineering products */
-#define	USB_PRODUCT_PIENGINEERING_PS2USB	0x020b		/* PS2 to Mac USB Adapter */
-
-/* Chic Technology products */
-#define	USB_PRODUCT_CHIC_MOUSE1	0x0001		/* mouse */
+/* Lucent products */
+#define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
 
 /* Macally products */
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
-/* LinkSys products */
-#define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* 10/100 ethernet adapter */
+/* Melco Inc products */
+#define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
+
+/* Microsoft products */
+#define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
+#define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural Keyboard Elite */
+#define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
+#define	USB_PRODUCT_MICROSOFT_SIDEWINDER	0x001a		/* Sidewinder Precision Racing Wheel */
+
+/* Midiman products */
+#define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
+
+/* Motorola products */
+#define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
 
 /* MultiTech products */
 #define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA-USB modem */
 
-/* ADS products */
-#define	USB_PRODUCT_ADS_ENET	0x0008		/* Ethernet adapter */
+/* Mustek products */
+#define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
 
-/* SMC products */
-#define	USB_PRODUCT_SMC_2102USB	0x0100		/* 10Mbps ethernet adapter */
-#define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 ethernet adapter */
+/* NEC products */
+#define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
+#define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
 
-/* Entrega products */
-#define	USB_PRODUCT_ENTREGA_1S	0x0001		/* 1S serial connector */
-#define	USB_PRODUCT_ENTREGA_2S	0x0002		/* 2S serial connector */
-#define	USB_PRODUCT_ENTREGA_1S25	0x0003		/* 1S25 serial connector */
-#define	USB_PRODUCT_ENTREGA_4S	0x0004		/* 4S serial connector */
-#define	USB_PRODUCT_ENTREGA_E45	0x0005		/* E45 Ethernet adapter */
-#define	USB_PRODUCT_ENTREGA_CENTRONICS	0x0006		/* Centronics connector */
-#define	USB_PRODUCT_ENTREGA_1S9	0x0093		/* 1S9 serial connector */
-#define	USB_PRODUCT_ENTREGA_EZUSB	0x8000		/* EZ-USB */
-#define	USB_PRODUCT_ENTREGA_SERIAL	0x8001		/* DB25 Serial connector */
-#define	USB_PRODUCT_ENTREGA_SERIAL_DB9	0x8093		/* DB9 Serial connector */
+/* NetChip Technology Products */
+#define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
 
-/* Midiman products */
-#define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
+/* Netgear products */
+#define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet adapter */
+
+/* OmniVision Technologies Inc. products */
+#define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
+
+/* Peracom products */
+#define	USB_PRODUCT_PERACOM_SERIAL1	0x0001		/* Serial Converter */
+#define	USB_PRODUCT_PERACOM_ENET	0x0002		/* Ethernet adapter */
+#define	USB_PRODUCT_PERACOM_ENET2	0x0005		/* Ethernet adapter */
+
+/* Philips products */
+#define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
+#define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS XXX Digital Speaker System */
+
+/* P.I. Engineering products */
+#define	USB_PRODUCT_PIENGINEERING_PS2USB	0x020b		/* PS2 to Mac USB Adapter */
+
+/* PLX products */
+#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
+
+/* Primax products */
+#define	USB_PRODUCT_PRIMAX_COMFORT	0x4d01		/* Comfort */
+#define	USB_PRODUCT_PRIMAX_MOUSEINABOX	0x4d02		/* Mouse-in-a-Box */
+
+/* Rockfire products */
+#define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
+
+/* Qtronix products */
+#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
 
 /* SanDisk products */
 #define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
 
-/* ADMtek products */
-#define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 USB Ethernet adapter */
-
-/* Corega products */
-#define	USB_PRODUCT_COREGA_USB_T	0x0001		/* USB ethernet adapter */
+/* Shuttle Technology products */
+#define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
 
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
 
-/* Handspring Inc. */
-#define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
+/* Sirius Technologies products */
+#define	USB_PRODUCT_SIRIUS_ROADSTER	0x0001		/* NetComm Roadster II 56 USB */
 
-/* ActiveWire Inc. products */
-#define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
-#define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 firmware */
+/* SMC products */
+#define	USB_PRODUCT_SMC_2102USB	0x0100		/* 10Mbps ethernet adapter */
+#define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 ethernet adapter */
 
-/* Netgear products */
-#define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet adapter */
+/* SOLID YEAR products */
+#define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Solid Year USB keyboard */
 
-/* Billionton products */
-#define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100 Ethernet adapter */
+/* STMicroelectronics products */
+#define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* USB Communicator */
 
-/* Motorola products */
-#define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
+/* Sun Microsystems products */
+#define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
+/* XXX The above is a North American PC style keyboard possibly */
 
-/* PLX products */
-#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
+/* Telex Communications products */
+#define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
 
-/* Inside Out Networks products */
-#define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
+/* Texas Intel products */
+#define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
 
-/* D-Link products */
-#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet adapter */
-#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet adapter */
-#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
+/* Thrustmaster products */
+#define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
 
-/* Intel products */
-#define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
+/* Universal Access products */
+#define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
+
+/* Vision products */
+#define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* VC6452V002 Camera */
+
+/* Wacom products */
+#define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */
+
+/* Zoom Telephonics Inc. products */
+#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ab9bd7f..b2a5fdf 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.8 2000/01/13 20:13:58 wpaul Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.9 2000/01/20 07:38:32 wpaul Exp 
  */
 
 /*
@@ -46,154 +46,154 @@
 
 struct usb_knowndev usb_knowndevs[] = {
 	{
-	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    0,
-	    "Aox Inc.",
-	    "USB ethernet controller engine",
+	    "3Com Corp.",
+	    "HomeConnect USB Camera",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
 	    0,
-	    "Hewlett Packard",
-	    "Scanjet 4100C",
+	    "3Com Corp.",
+	    "3C19250 Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
-	    "Hewlett Packard",
-	    "Scanjet 6300C",
+	    "3Com Corp.",
+	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
-	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
 	    0,
-	    "NEC",
-	    "hub",
+	    "U.S. Robotics",
+	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
-	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_B,
+	    USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U,
 	    0,
-	    "NEC",
-	    "hub",
+	    "Acer Peripheral Inc.",
+	    "Acerscan C310U",
 	},
 	{
-	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
+	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
-	    "Eastman Kodak Corp.",
-	    "Digital Science DC260",
+	    "ActiveWire Inc.",
+	    "I/O Board",
 	},
 	{
-	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
+	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
 	    0,
-	    "Eastman Kodak Corp.",
-	    "Digital Science DC240",
+	    "ActiveWire Inc.",
+	    "I/O Board, rev. 1 firmware",
 	},
 	{
-	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280,
+	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
-	    "Eastman Kodak Corp.",
-	    "Digital Science DC280",
+	    "ADMtek Inc.",
+	    "AN986 USB Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
+	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
 	    0,
-	    "Melco Inc.",
-	    "LU-ATX Ethernet adapter",
+	    "ADS Technologies",
+	    "UBS-10BT Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
 	    0,
-	    "Computer Access Technology Corp.",
-	    "Andromeda hub",
+	    "Elecom Corp. Ltd.",
+	    "mouse 29UO",
 	},
 	{
-	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
+	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
-	    "Computer Access Technology Corp.",
-	    "Netmate ethernet adapter",
+	    "Fast Security AG",
+	    "USB-HASP 0.06",
 	},
 	{
-	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2,
+	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
 	    0,
-	    "Computer Access Technology Corp.",
-	    "Netmate2 ethernet adapter",
+	    "Altec Lansing",
+	    "ASC495 Speakers",
 	},
 	{
-	    USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF,
+	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
 	    0,
-	    "Computer Access Technology Corp.",
-	    "USB Chief Bus & Protocol Analyzer",
+	    "American Power Conversion",
+	    "Back-UPS Pro 500",
 	},
 	{
-	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
+	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
-	    "Advanced Gravis Computer Tech. Ltd.",
-	    "GamePad Pro",
+	    "Anchor Chips Inc.",
+	    "EZUSB",
 	},
 	{
-	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
+	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
 	    0,
-	    "Sun Microsystems",
-	    "Type 6 USB",
+	    "Aox Inc.",
+	    "USB ethernet controller engine",
 	},
 	{
-	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
+	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
-	    "Lexmark International Inc.",
-	    "Optra S 2450",
+	    "ATEN International Corp. Ltd.",
+	    "Parallel printer adapter",
 	},
 	{
-	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
+	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
 	    0,
-	    "Thrustmaster",
-	    "Fusion Digital Gamepad",
+	    "ATEN International Corp. Ltd.",
+	    "10Mbps ethernet adapter",
 	},
 	{
-	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
+	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
-	    "Texas Instruments",
-	    "UT-USB41 hub",
+	    "Billionton Systems Inc.",
+	    "USB100N 10/100 FastEthernet Adapter",
 	},
 	{
-	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE,
+	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
 	    0,
-	    "KYE Systems Corp.",
-	    "Niche mouse",
+	    "Brother Industries Corp.",
+	    "HL-1050 laser printer",
 	},
 	{
-	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
+	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
 	    0,
-	    "KYE Systems Corp.",
-	    "Flight 2000 joystick",
+	    "Behavior Tech. Computer",
+	    "Keyboard with mouse port",
 	},
 	{
-	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIMOUSE,
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
-	    "Microsoft",
-	    "IntelliMouse",
+	    "Canon Inc.",
+	    "PowerShot S10",
 	},
 	{
-	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_NATURALKBD,
+	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
 	    0,
-	    "Microsoft",
-	    "Natural Keyboard Elite",
+	    "Computer Access Technology Corp.",
+	    "Netmate ethernet adapter",
 	},
 	{
-	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_DDS80,
+	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2,
 	    0,
-	    "Microsoft",
-	    "Digital Sound System 80",
+	    "Computer Access Technology Corp.",
+	    "Netmate2 ethernet adapter",
 	},
 	{
-	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT,
+	    USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF,
 	    0,
-	    "Primax Electronics",
-	    "Comfort",
+	    "Computer Access Technology Corp.",
+	    "USB Chief Bus & Protocol Analyzer",
 	},
 	{
-	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_MOUSEINABOX,
+	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
 	    0,
-	    "Primax Electronics",
-	    "Mouse-in-a-Box",
+	    "Computer Access Technology Corp.",
+	    "Andromeda hub",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
@@ -208,292 +208,298 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "My3000 hub",
 	},
 	{
-	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
+	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_MOUSE1,
 	    0,
-	    "Behavior Tech. Computer",
-	    "Keyboard with mouse port",
+	    "Chic Technology",
+	    "mouse",
 	},
 	{
-	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS350,
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
 	    0,
-	    "Philips",
-	    "DSS 350 Digital Speaker System",
+	    "Chicony Electronics Co., Ltd.",
+	    "KB-8933 keyboard",
 	},
 	{
-	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS,
+	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
 	    0,
-	    "Philips",
-	    "DSS XXX Digital Speaker System",
+	    "Connectix Corp.",
+	    "QuickCam",
 	},
 	{
-	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_HUB,
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T,
 	    0,
-	    "Philips",
-	    "hub",
+	    "Corega",
+	    "Ether USB-T",
 	},
 	{
-	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
+	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    0,
-	    "Philips",
-	    "DSS XXX Digital Speaker System",
+	    "Cypress Semiconductor",
+	    "mouse",
 	},
 	{
-	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
+	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_THERMO,
 	    0,
-	    "Connectix Corp.",
-	    "QuickCam",
+	    "Cypress Semiconductor",
+	    "thermometer",
 	},
 	{
-	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
-	    "Lucent",
-	    "USS-720 evaluation kit",
+	    "D-Link Corp",
+	    "10Mbps ethernet adapter",
 	},
 	{
-	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
 	    0,
-	    "STMicroelectronics",
-	    "USB Communicator",
+	    "D-Link Corp",
+	    "10/100 ethernet adapter",
 	},
 	{
-	    USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
 	    0,
-	    "Acer Peripheral Inc.",
-	    "Acerscan C310U",
+	    "D-Link Corp",
+	    "1/10/100 ethernet adapter",
 	},
 	{
-	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
 	    0,
-	    "Canon Inc.",
-	    "PowerShot S10",
+	    "Dallas Semiconductor",
+	    "J-6502 speakers",
 	},
 	{
-	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
+	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
 	    0,
-	    "Cypress Semiconductor",
-	    "mouse",
+	    "Diamond",
+	    "Rio 500 USB",
 	},
 	{
-	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_THERMO,
+	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
-	    "Cypress Semiconductor",
-	    "thermometer",
+	    "EIZO",
+	    "hub",
 	},
 	{
-	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
+	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
 	    0,
-	    "Seiko Epson Corp.",
-	    "ISD USB Smart Cable for Mac",
+	    "EIZO",
+	    "monitor",
 	},
 	{
-	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
+	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
 	    0,
-	    "Seiko Epson Corp.",
-	    "ISD USB Smart Cable",
+	    "ELSA Gmbh",
+	    "ELSA Modem Board",
 	},
 	{
-	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
 	    0,
-	    "U.S. Robotics",
-	    "U.S.Robotics 56000 Voice Faxmodem Pro",
+	    "Entrega",
+	    "1S serial connector",
 	},
 	{
-	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2S,
 	    0,
-	    "Konica Corp.",
-	    "Digital Color Camera",
+	    "Entrega",
+	    "2S serial connector",
 	},
 	{
-	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S25,
 	    0,
-	    "Altec Lansing",
-	    "ASC495 Speakers",
+	    "Entrega",
+	    "1S25 serial connector",
 	},
 	{
-	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_4S,
 	    0,
-	    "Shuttle Technology",
-	    "E-USB Bridge",
+	    "Entrega",
+	    "4S serial connector",
 	},
 	{
-	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45,
 	    0,
-	    "Chicony Electronics Co., Ltd.",
-	    "KB-8933 keyboard",
+	    "Entrega",
+	    "E45 Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
 	    0,
-	    "Brother Industries Corp.",
-	    "HL-1050 laser printer",
+	    "Entrega",
+	    "Centronics connector",
 	},
 	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9,
 	    0,
-	    "Dallas Semiconductor",
-	    "J-6502 speakers",
+	    "Entrega",
+	    "1S9 serial connector",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
+	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB,
 	    0,
-	    "3Com Corp.",
-	    "3C19250 Ethernet adapter",
+	    "Entrega",
+	    "EZ-USB",
 	},
 	{
-	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
+	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
 	    0,
-	    "Kawatsu Semiconductor, Inc.",
-	    "MiniHub 4000P",
+	    "e-TEK Labs",
+	    "Serial port",
 	},
 	{
-	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
 	    0,
-	    "American Power Conversion",
-	    "Back-UPS Pro 500",
+	    "Seiko Epson Corp.",
+	    "ISD USB Smart Cable for Mac",
 	},
 	{
-	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
 	    0,
-	    "NetChip Technology",
-	    "Turbo-Connect",
+	    "Seiko Epson Corp.",
+	    "ISD USB Smart Cable",
 	},
 	{
-	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
+	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    0,
-	    "Fast Security AG",
-	    "USB-HASP 0.06",
+	    "Advanced Gravis Computer Tech. Ltd.",
+	    "GamePad Pro",
 	},
 	{
-	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
+	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
-	    "Universal Access",
-	    "Panache Surf USB ISDN Adapter",
+	    "Handspring Inc.",
+	    "Handspring Visor",
 	},
 	{
-	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
 	    0,
-	    "Anchor Chips Inc.",
-	    "EZUSB",
+	    "Hewlett Packard",
+	    "Scanjet 4100C",
 	},
 	{
-	    USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_S20,
 	    0,
-	    "VLSI Vision Ltd.",
-	    "VC6452V002 Camera",
+	    "Hewlett Packard",
+	    "Photosmart S20",
 	},
 	{
-	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
 	    0,
-	    "ATEN International Corp. Ltd.",
-	    "Parallel printer adapter",
+	    "Hewlett Packard",
+	    "Scanjet 5200",
 	},
 	{
-	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
 	    0,
-	    "ATEN International Corp. Ltd.",
-	    "10Mbps ethernet adapter",
+	    "Hewlett Packard",
+	    "Scanjet 6300C",
 	},
 	{
-	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
 	    0,
-	    "Mustek Systems Inc.",
-	    "MDC-800 digital camera",
+	    "Hewlett Packard",
+	    "Deskjet 970Cse",
 	},
 	{
-	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
 	    0,
-	    "Telex Communications Inc.",
-	    "Enhanced USB Microphone",
+	    "Hewlett Packard",
+	    "Photosmart P1100",
 	},
 	{
-	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
+	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
-	    "Peracom Networks Inc.",
-	    "Serial Converter",
+	    "Inside Out Networks",
+	    "EdgePort/4 serial ports",
 	},
 	{
-	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
 	    0,
-	    "Peracom Networks Inc.",
-	    "Ethernet adapter",
+	    "In-System Design",
+	    "Parallel printer adapter",
 	},
 	{
-	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
 	    0,
-	    "Peracom Networks Inc.",
-	    "Ethernet adapter",
+	    "In-System Design",
+	    "IDE adapter",
 	},
 	{
-	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
+	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
 	    0,
-	    "WACOM Corp. Ltd.",
-	    "CT-0405-U Tablet",
+	    "Intel",
+	    "82930 test board",
 	},
 	{
-	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
+	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
 	    0,
-	    "e-TEK Labs",
-	    "Serial port",
+	    "Iomega Corp.",
+	    "Zip 100",
 	},
 	{
-	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
+	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
-	    "EIZO",
-	    "hub",
+	    "Kawatsu Semiconductor, Inc.",
+	    "MiniHub 4000P",
 	},
 	{
-	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
 	    0,
-	    "EIZO",
-	    "monitor",
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC260",
 	},
 	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC265,
 	    0,
-	    "Elecom Corp. Ltd.",
-	    "mouse 29UO",
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC265",
 	},
 	{
-	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC290,
 	    0,
-	    "Rockfire",
-	    "gamepad 203USB",
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC290",
 	},
 	{
-	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
 	    0,
-	    "Iomega Corp.",
-	    "Zip 100",
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC240",
 	},
 	{
-	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280,
 	    0,
-	    "OmniVision",
-	    "OV511 Camera",
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC280",
 	},
 	{
-	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
+	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
 	    0,
-	    "In-System Design",
-	    "Parallel printer adapter",
+	    "Konica Corp.",
+	    "Digital Color Camera",
 	},
 	{
-	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
+	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE,
 	    0,
-	    "In-System Design",
-	    "IDE adapter",
+	    "KYE Systems Corp.",
+	    "Niche mouse",
 	},
 	{
-	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
+	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
 	    0,
-	    "Qtronix Corp",
-	    "Scorpion-980N keyboard",
+	    "KYE Systems Corp.",
+	    "Flight 2000 joystick",
 	},
 	{
-	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
+	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
-	    "ELSA Gmbh",
-	    "ELSA Modem Board",
+	    "Lexmark International Inc.",
+	    "Optra S 2450",
+	},
+	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
+	    0,
+	    "Linksys Inc.",
+	    "USB100TX Ethernet",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
@@ -532,28 +538,58 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "M-BA47 mouse",
 	},
 	{
-	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
+	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
 	    0,
-	    "P.I. Engineering",
-	    "PS2 to Mac USB Adapter",
+	    "Lucent",
+	    "USS-720 evaluation kit",
 	},
 	{
-	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_MOUSE1,
+	    USB_VENDOR_MACALLY, USB_PRODUCT_MACALLY_MOUSE1,
 	    0,
-	    "Chic Technology",
+	    "Macally",
 	    "mouse",
 	},
 	{
-	    USB_VENDOR_MACALLY, USB_PRODUCT_MACALLY_MOUSE1,
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
 	    0,
-	    "Macally",
-	    "mouse",
+	    "Melco Inc.",
+	    "LU-ATX Ethernet",
 	},
 	{
-	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIMOUSE,
 	    0,
-	    "LinkSys",
-	    "10/100 ethernet adapter",
+	    "Microsoft",
+	    "IntelliMouse",
+	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_NATURALKBD,
+	    0,
+	    "Microsoft",
+	    "Natural Keyboard Elite",
+	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_DDS80,
+	    0,
+	    "Microsoft",
+	    "Digital Sound System 80",
+	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEWINDER,
+	    0,
+	    "Microsoft",
+	    "Sidewinder Precision Racing Wheel",
+	},
+	{
+	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
+	    0,
+	    "Midiman",
+	    "Midisport 2x2",
+	},
+	{
+	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
+	    0,
+	    "Motorola",
+	    "MC141555 hub controller",
 	},
 	{
 	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
@@ -562,106 +598,130 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "MT5634ZBA-USB modem",
 	},
 	{
-	    USB_VENDOR_ADS, USB_PRODUCT_ADS_ENET,
+	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
-	    "ADS Technologies",
+	    "Mustek Systems Inc.",
+	    "MDC-800 digital camera",
+	},
+	{
+	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
+	    0,
+	    "NEC",
+	    "hub",
+	},
+	{
+	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_B,
+	    0,
+	    "NEC",
+	    "hub",
+	},
+	{
+	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
+	    0,
+	    "NetChip Technology",
+	    "Turbo-Connect",
+	},
+	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
+	    0,
+	    "BayNETGEAR Inc.",
 	    "Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
+	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
 	    0,
-	    "Standard Microsystems Corp",
-	    "10Mbps ethernet adapter",
+	    "OmniVision",
+	    "OV511 Camera",
 	},
 	{
-	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB,
+	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
-	    "Standard Microsystems Corp",
-	    "10/100 ethernet adapter",
+	    "Peracom Networks Inc.",
+	    "Serial Converter",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
+	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
 	    0,
-	    "Entrega",
-	    "1S serial connector",
+	    "Peracom Networks Inc.",
+	    "Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2S,
+	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
 	    0,
-	    "Entrega",
-	    "2S serial connector",
+	    "Peracom Networks Inc.",
+	    "Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S25,
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS350,
 	    0,
-	    "Entrega",
-	    "1S25 serial connector",
+	    "Philips",
+	    "DSS 350 Digital Speaker System",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_4S,
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS,
 	    0,
-	    "Entrega",
-	    "4S serial connector",
+	    "Philips",
+	    "DSS XXX Digital Speaker System",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45,
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_HUB,
 	    0,
-	    "Entrega",
-	    "E45 Ethernet adapter",
+	    "Philips",
+	    "hub",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
 	    0,
-	    "Entrega",
-	    "Centronics connector",
+	    "Philips",
+	    "DSS XXX Digital Speaker System",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9,
+	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
 	    0,
-	    "Entrega",
-	    "1S9 serial connector",
+	    "P.I. Engineering",
+	    "PS2 to Mac USB Adapter",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB,
+	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
 	    0,
-	    "Entrega",
-	    "EZ-USB",
+	    "PLX",
+	    "test board",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_SERIAL,
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT,
 	    0,
-	    "Entrega",
-	    "DB25 Serial connector",
+	    "Primax Electronics",
+	    "Comfort",
 	},
 	{
-	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_SERIAL_DB9,
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_MOUSEINABOX,
 	    0,
-	    "Entrega",
-	    "DB9 Serial connector",
+	    "Primax Electronics",
+	    "Mouse-in-a-Box",
 	},
 	{
-	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
+	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
-	    "Midiman",
-	    "Midisport 2x2",
+	    "Rockfire",
+	    "gamepad 203USB",
 	},
 	{
-	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
+	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    0,
-	    "SanDisk Corp",
-	    "USB ImageMate",
+	    "Qtronix Corp",
+	    "Scorpion-980N keyboard",
 	},
 	{
-	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
 	    0,
-	    "ADMtek Inc.",
-	    "AN986 USB Ethernet adapter",
+	    "SanDisk Corp",
+	    "USB ImageMate",
 	},
 	{
-	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_USB_T,
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
 	    0,
-	    "Corega",
-	    "USB ethernet adapter",
+	    "Shuttle Technology",
+	    "E-USB Bridge",
 	},
 	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
@@ -670,76 +730,82 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "DigiFilm-Combo Reader",
 	},
 	{
-	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
+	    USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER,
 	    0,
-	    "Handspring Inc.",
-	    "Handspring Visor",
+	    "Sirius Technologies",
+	    "NetComm Roadster II 56 USB",
 	},
 	{
-	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
+	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
 	    0,
-	    "ActiveWire Inc.",
-	    "I/O Board",
+	    "Standard Microsystems Corp",
+	    "10Mbps ethernet adapter",
 	},
 	{
-	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
+	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB,
 	    0,
-	    "ActiveWire Inc.",
-	    "I/O Board, rev. 1 firmware",
+	    "Standard Microsystems Corp",
+	    "10/100 ethernet adapter",
 	},
 	{
-	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
+	    USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD,
 	    0,
-	    "BayNETGEAR Inc.",
-	    "Ethernet adapter",
+	    "Solid Year",
+	    "Solid Year USB keyboard",
 	},
 	{
-	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
+	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
 	    0,
-	    "Billionton Systems",
-	    "USB100 Ethernet adapter",
+	    "STMicroelectronics",
+	    "USB Communicator",
 	},
 	{
-	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
+	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
 	    0,
-	    "Motorola",
-	    "MC141555 hub controller",
+	    "Sun Microsystems",
+	    "Type 6 USB",
 	},
 	{
-	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
+	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
-	    "PLX",
-	    "test board",
+	    "Telex Communications Inc.",
+	    "Enhanced USB Microphone",
 	},
 	{
-	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
+	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
 	    0,
-	    "Inside Out Networks",
-	    "EdgePort/4 serial ports",
+	    "Texas Instruments",
+	    "UT-USB41 hub",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
+	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
 	    0,
-	    "D-Link Corp",
-	    "10Mbps ethernet adapter",
+	    "Thrustmaster",
+	    "Fusion Digital Gamepad",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
+	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
 	    0,
-	    "D-Link Corp",
-	    "10/100 ethernet adapter",
+	    "Universal Access",
+	    "Panache Surf USB ISDN Adapter",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
+	    USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002,
 	    0,
-	    "D-Link Corp",
-	    "1/10/100 ethernet adapter",
+	    "VLSI Vision Ltd.",
+	    "VC6452V002 Camera",
 	},
 	{
-	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
 	    0,
-	    "Intel",
-	    "82930 test board",
+	    "WACOM Corp. Ltd.",
+	    "CT-0405-U Tablet",
+	},
+	{
+	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
+	    0,
+	    "Zoom Telephonics Inc.",
+	    "2986L Fax modem",
 	},
 	{
 	    USB_VENDOR_AOX, 0,
@@ -1108,6 +1174,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SOLIDYEAR, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Solid Year",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MACALLY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Macally",
@@ -1116,7 +1188,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "LinkSys",
+	    "Linksys Inc.",
 	    NULL,
 	},
 	{
@@ -1132,6 +1204,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SIRIUS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Sirius Technologies",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SMC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Standard Microsystems Corp",
@@ -1168,15 +1246,21 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ZOOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Zoom Telephonics Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Handspring Inc.",
 	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTIVEWIRE, 0,
+	    USB_VENDOR_DIAMOND, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ActiveWire Inc.",
+	    "Diamond",
 	    NULL,
 	},
 	{
@@ -1186,9 +1270,15 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ACTIVEWIRE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ActiveWire Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BILLIONTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Billionton Systems",
+	    "Billionton Systems Inc.",
 	    NULL,
 	},
 	{