sync

2 files changed, 300 insertions, 1302 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 06d941fb46d..5869f936504 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.28 2000/12/05 22:58:03 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.29 2001/01/27 04:02:16 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.29 2000/12/05 22:58:00 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.30 2001/01/27 04:01:53 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
@@ -62,11 +62,11 @@
 #define	USB_VENDOR_CREATIVELABS	0x041e		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology */
-#define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. */
+#define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer */
 #define	USB_VENDOR_SUN	0x0430		/* Sun Microsystems */
 #define	USB_VENDOR_AMD	0x0438		/* Advanced Micro Devices */
 #define	USB_VENDOR_LEXMARK	0x043d		/* Lexmark International */
-#define	USB_VENDOR_NANAO	0x0440		/* NANAO Corp. */
+#define	USB_VENDOR_NANAO	0x0440		/* NANAO */
 #define	USB_VENDOR_ALPS	0x044e		/* Alps Electric */
 #define	USB_VENDOR_THRUST	0x044f		/* Thrustmaster */
 #define	USB_VENDOR_TI	0x0451		/* Texas Instruments */
@@ -85,13 +85,13 @@
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
-#define	USB_VENDOR_COMPAQ	0x049f		/* Compaq Computers */
+#define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon */
-#define	USB_VENDOR_IBM	0x04b3		/* IBM Corporation */
+#define	USB_VENDOR_IBM	0x04b3		/* IBM */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
-#define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
+#define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson */
 #define	USB_VENDOR_RAINBOW	0x04b9		/* Rainbow Technologies */
 #define	USB_VENDOR_IODATA	0x04bb		/* I/O Data */
 #define	USB_VENDOR_3COMUSR	0x04c1		/* U.S. Robotics */
@@ -108,9 +108,9 @@
 #define	USB_VENDOR_TATUNG	0x04cd		/* Tatung Co. Of America */
 #define	USB_VENDOR_SCANLOGIC	0x04ce		/* ScanLogic */
 #define	USB_VENDOR_MYSON	0x04cf		/* Myson Technology */
-#define	USB_VENDOR_DIGI2	0x04d0		/* Digi International */
+#define	USB_VENDOR_DIGI2	0x04d0		/* Digi */
 #define	USB_VENDOR_ITTCANON	0x04d1		/* ITT Canon */
-#define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing Technologies */
+#define	USB_VENDOR_ALTEC	0x04d2		/* Altec Lansing */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_ANNABOOKS	0x04ed		/* Annabooks */
 #define	USB_VENDOR_CHICONY	0x04f2		/* Chicony Electronics */
@@ -290,14 +290,14 @@
 /* 3Com products */
 #define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect Camera */
 #define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet */
-#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
+#define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect Ethernet */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
 #define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
 #define	USB_PRODUCT_3COMUSR_HOMECONN	0x009d		/* 3Com HomeConnect camera */
-#define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
+#define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 */
 
 
 /* Acer Peripherals products */
@@ -332,7 +332,7 @@
 
 #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 Keyboard */
+#define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan */
 #define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
 
 /* Altec Lansing products */
@@ -372,7 +372,7 @@
 #define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
 
 /* Behavior Technology Computer products */
-#define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
+#define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard */
 
 /* Canon products */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
@@ -384,15 +384,15 @@
 #define	USB_PRODUCT_CATC_ANDROMEDA	0x1237		/* Andromeda hub */
 
 /* Cherry products */
-#define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 keyboard */
-#define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 hub */
+#define	USB_PRODUCT_CHERRY_MY3000KBD	0x0001		/* My3000 */
+#define	USB_PRODUCT_CHERRY_MY3000HUB	0x0003		/* My3000 */
 
 /* Chic Technology products */
 #define	USB_PRODUCT_CHIC_MOUSE1	0x0001		/* mouse */
-#define	USB_PRODUCT_CHIC_CYPRESS	0x0003		/* Cypress Mouse */
+#define	USB_PRODUCT_CHIC_CYPRESS	0x0003		/* Cypress */
 
 /* Chicony products */
-#define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
+#define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 */
 
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_PJB100	0x504a		/* Personal Jukebox PJB100 */
@@ -439,7 +439,7 @@
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
 
 /* Elsa products */
-#define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA Modem Board */
+#define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA */
 
 /* Entrega products */
 #define	USB_PRODUCT_ENTREGA_1S	0x0001		/* 1S serial connector */
@@ -576,8 +576,8 @@
 #define	USB_PRODUCT_LINKSYS_USB10TA	0x2206		/* USB10TA Ethernet */
 
 /* Logitech products */
-#define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
-#define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 mouse */
+#define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 */
+#define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 */
 #define	USB_PRODUCT_LOGITECH_PAGESCAN	0x040f		/* PageScan */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMWEB	0x0801		/* QuickCam Web */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO	0x0810		/* QuickCam Pro */
@@ -611,11 +611,11 @@
 /* Microsoft products */
 #define	USB_PRODUCT_MICROSOFT_SIDEPREC	0x0008		/* SideWinder Precision Pro */
 #define	USB_PRODUCT_MICROSOFT_INTELLIMOUSE	0x0009		/* IntelliMouse */
-#define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural Keyboard Elite */
+#define	USB_PRODUCT_MICROSOFT_NATURALKBD	0x000b		/* Natural */
 #define	USB_PRODUCT_MICROSOFT_DDS80	0x0014		/* Digital Sound System 80 */
 #define	USB_PRODUCT_MICROSOFT_SIDEWINDER	0x001a		/* Sidewinder Precision Racing Wheel */
 #define	USB_PRODUCT_MICROSOFT_INTELLIEYE	0x0025		/* IntelliEye mouse */
-#define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
+#define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Pro */
 
 /* Microtek products */
 #define	USB_PRODUCT_MICROTEK_X6U	0x0099		/* ScanMaker X6 - X6U */
@@ -633,7 +633,7 @@
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
 
 /* MultiTech products */
-#define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA-USB modem */
+#define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA */
 
 /* Mustek products */
 #define	USB_PRODUCT_MUSTEK_1200CU	0x0001		/* 1200 CU scanner */
@@ -704,7 +704,7 @@
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
 
 /* Qtronix products */
-#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
+#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N */
 
 /* Quickshot products */
 #define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
@@ -735,11 +735,11 @@
 #define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 Ethernet */
 
 /* SOLID YEAR products */
-#define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Solid Year keyboard */
+#define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Keyboard */
 
 /* SONY products */
 #define	USB_PRODUCT_SONY_DSC	0x0010		/* Sony DSC Cameras */
-#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick slot */
+#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick Slot */
 
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* Communicator */
@@ -749,12 +749,12 @@
 /* XXX The above is a North American PC style keyboard possibly */
 
 /* Supra products */
-#define	USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K modem */
-#define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K Modem */
+#define	USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K */
+#define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 */
 
 /* TEAC products */
-#define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB Floppy */
+#define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB */
 
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Microphone */
@@ -801,7 +801,7 @@
 #define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
 
 /* Zoom Telephonics products */
-#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
+#define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L */
 
 /* ZyXEL Communication Co. products */
-#define	USB_PRODUCT_ZYXEL_980N	0x2011		/* Scorpion-980N keyboard */
+#define	USB_PRODUCT_ZYXEL_980N	0x2011		/* Scorpion-980N */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 863b226284e..926cc01ba19 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.28 2000/12/05 22:58:03 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.29 2001/01/27 04:02:16 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.29 2000/12/05 22:58:00 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.30 2001/01/27 04:01:53 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
@@ -45,3024 +45,2022 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-struct usb_knowndev usb_knowndevs[] = {
+struct usb_known_product usb_known_products[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
-	    0,
-	    "3Com",
 	    "HomeConnect Camera",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
-	    0,
-	    "3Com",
 	    "3C19250 Ethernet",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
-	    0,
-	    "3Com",
-	    "U.S.Robotics 56000 Voice Faxmodem Pro",
+	    "U.S.Robotics 56000",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
-	    0,
-	    "3Com",
 	    "HomeConnect Ethernet",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
-	    0,
-	    "U.S. Robotics",
 	    "3Com OfficeConnect Analog Modem",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USRISDN,
-	    0,
-	    "U.S. Robotics",
 	    "3Com U.S. Robotics Pro ISDN TA",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_HOMECONN,
-	    0,
-	    "U.S. Robotics",
 	    "3Com HomeConnect camera",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
-	    0,
-	    "U.S. Robotics",
-	    "U.S.Robotics 56000 Voice Faxmodem Pro",
+	    "U.S.Robotics 56000",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
-	    0,
-	    "Acer Peripherals",
 	    "Acerscan C310U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U,
-	    0,
-	    "Acer Peripherals",
 	    "Acerscan 320U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U,
-	    0,
-	    "Acer Peripherals",
 	    "Acerscan 640U",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U,
-	    0,
-	    "Acer Peripherals",
 	    "Acerscan 620U",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
-	    0,
-	    "ActiveWire",
 	    "I/O Board",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
-	    0,
-	    "ActiveWire",
 	    "I/O Board, rev. 1",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
-	    0,
-	    "ADMtek",
 	    "AN986 Ethernet",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
-	    0,
-	    "ADS Technologies",
 	    "UBS-10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
-	    0,
-	    "Elecom",
 	    "mouse 29UO",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U,
-	    0,
-	    "AGFA-Gevaert NV",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH,
-	    0,
-	    "AGFA-Gevaert NV",
 	    "SnapScan Touch",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2,
-	    0,
-	    "AGFA-Gevaert NV",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
-	    0,
-	    "Aladdin Knowledge Systems",
 	    "USB-HASP 0.06",
 	},
 	{
 	    USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB,
-	    0,
-	    "Alcor Micro",
 	    "Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB,
-	    0,
-	    "Alcor Micro",
 	    "MacAlly Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU9814,
-	    0,
-	    "Alcor Micro",
 	    "AU9814 Hub",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SM_KBD,
-	    0,
-	    "Alcor Micro",
-	    "MicroConnectors/StrongMan Keyboard",
+	    "MicroConnectors/StrongMan",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_NEC_KBD_HUB,
-	    0,
-	    "Alcor Micro",
 	    "NEC Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
-	    0,
-	    "Altec Lansing Technologies",
 	    "ADA70 Speakers",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
-	    0,
-	    "Altec Lansing Technologies",
 	    "ASC495 Speakers",
 	},
 	{
 	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
-	    0,
-	    "American Power Conversion",
 	    "Back-UPS Pro 500",
 	},
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
-	    0,
-	    "Anchor Chips",
 	    "EZUSB",
 	},
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZLINK,
-	    0,
-	    "Anchor Chips",
 	    "EZLINK",
 	},
 	{
 	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
-	    0,
-	    "AOX",
 	    "USB Ethernet controller engine",
 	},
 	{
 	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE,
-	    0,
-	    "Apple Computer",
 	    "Optical mouse",
 	},
 	{
 	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS,
-	    0,
-	    "Apple Computer",
 	    "Speakers",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
-	    0,
-	    "ATEN International",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
-	    0,
-	    "ATEN International",
 	    "10Mbps Ethernet",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
-	    0,
-	    "ATEN International",
 	    "Serial adapter",
 	},
 	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
-	    0,
-	    "Avision",
 	    "1200U scanner",
 	},
 	{
 	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
-	    0,
-	    "Belkin Components",
 	    "F5U002 Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
-	    0,
-	    "Billionton Systems",
 	    "USB100N 10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
-	    0,
-	    "Brother Industries",
 	    "HL-1050 laser printer",
 	},
 	{
 	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
-	    0,
-	    "Behavior Tech. Computer",
-	    "Keyboard with mouse port",
+	    "Keyboard",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
-	    0,
-	    "Canon",
 	    "PowerShot S10",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
-	    0,
-	    "Computer Access Technology",
 	    "Netmate Ethernet",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2,
-	    0,
-	    "Computer Access Technology",
 	    "Netmate2 Ethernet",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF,
-	    0,
-	    "Computer Access Technology",
 	    "USB Chief Bus & Protocol Analyzer",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA,
-	    0,
-	    "Computer Access Technology",
 	    "Andromeda hub",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
-	    0,
-	    "Cherry Mikroschalter",
-	    "My3000 keyboard",
+	    "My3000",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB,
-	    0,
-	    "Cherry Mikroschalter",
-	    "My3000 hub",
+	    "My3000",
 	},
 	{
 	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_MOUSE1,
-	    0,
-	    "Chic Technology",
 	    "mouse",
 	},
 	{
 	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS,
-	    0,
-	    "Chic Technology",
-	    "Cypress Mouse",
+	    "Cypress",
 	},
 	{
 	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
-	    0,
-	    "Chicony Electronics",
-	    "KB-8933 keyboard",
+	    "KB-8933",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100,
-	    0,
-	    "Compaq Computers",
 	    "Personal Jukebox PJB100",
 	},
 	{
 	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
-	    0,
-	    "Connectix",
 	    "QuickCam",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T,
-	    0,
-	    "Corega",
 	    "Ether USB-T",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX,
-	    0,
-	    "Corega",
 	    "FEther USB-TX",
 	},
 	{
 	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_II,
-	    0,
-	    "Creative Labs",
 	    "Nomad II",
 	},
 	{
 	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_IIMG,
-	    0,
-	    "Creative Labs",
 	    "Nomad II MG",
 	},
 	{
 	    USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300,
-	    0,
-	    "Chuntex",
 	    "Ex1300 hub",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
-	    0,
-	    "Cypress Semiconductor",
 	    "mouse",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_THERMO,
-	    0,
-	    "Cypress Semiconductor",
 	    "thermometer",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
-	    0,
-	    "Cypress Semiconductor",
 	    "FM Radio",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
-	    0,
-	    "D-Link",
 	    "10Mbps Ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
-	    0,
-	    "D-Link",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
-	    0,
-	    "D-Link",
 	    "1/10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
-	    0,
-	    "D-Link",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
-	    0,
-	    "Dallas Semiconductor",
 	    "J-6502 speakers",
 	},
 	{
 	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
-	    0,
-	    "Diamond",
 	    "Rio 500 USB",
 	},
 	{
 	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
-	    0,
-	    "Digi International",
 	    "AccelePort 2",
 	},
 	{
 	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
-	    0,
-	    "Digi International",
 	    "AccelePort 4",
 	},
 	{
 	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
-	    0,
-	    "Digi International",
 	    "AccelePort 8",
 	},
 	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
-	    0,
-	    "EIZO",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
-	    0,
-	    "EIZO",
 	    "monitor",
 	},
 	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
-	    0,
 	    "ELSA",
-	    "ELSA Modem Board",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
-	    0,
-	    "Entrega",
 	    "1S serial connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2S,
-	    0,
-	    "Entrega",
 	    "2S serial connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S25,
-	    0,
-	    "Entrega",
 	    "1S25 serial connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_4S,
-	    0,
-	    "Entrega",
 	    "4S serial connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45,
-	    0,
-	    "Entrega",
 	    "E45 Ethernet",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
-	    0,
-	    "Entrega",
 	    "Centronics connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9,
-	    0,
-	    "Entrega",
 	    "1S9 serial connector",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB,
-	    0,
-	    "Entrega",
 	    "EZ-USB",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2U4S,
-	    0,
-	    "Entrega",
 	    "2U4S serial connector/usb hub",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
-	    0,
-	    "Seiko Epson Corp.",
 	    "USB Printer",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
-	    0,
-	    "Seiko Epson Corp.",
 	    "ISD Smart Cable for Mac",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
-	    0,
-	    "Seiko Epson Corp.",
 	    "ISD Smart Cable",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636,
-	    0,
-	    "Seiko Epson Corp.",
 	    "Perfection 636U / 636Photo scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610,
-	    0,
-	    "Seiko Epson Corp.",
 	    "Perfection 610 scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200,
-	    0,
-	    "Seiko Epson Corp.",
 	    "Perfection 1200U / 1200Photo scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
-	    0,
-	    "Seiko Epson Corp.",
 	    "Expression 1600",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
-	    0,
-	    "e-TEK Labs",
 	    "Serial port",
 	},
 	{
 	    USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS,
-	    0,
-	    "Extended Systems",
 	    "XTNDAccess IrDA",
 	},
 	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
-	    0,
-	    "Advanced Gravis Computer Tech.",
 	    "GamePad Pro",
 	},
 	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
-	    0,
-	    "Griffin Technology",
 	    "iMate, ABD adapter",
 	},
 	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
-	    0,
-	    "Freecom",
 	    "Connector for DVD drive",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL,
-	    0,
-	    "Future Technology Devices",
 	    "Serial converter",
 	},
 	{
 	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
-	    0,
-	    "Fuji Photo Film",
 	    "Mass Storage",
 	},
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
-	    0,
-	    "Handspring",
 	    "Handspring Visor",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 4100C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_S20,
-	    0,
-	    "Hewlett Packard",
 	    "Photosmart S20",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 4200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 6200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_S20b,
-	    0,
-	    "Hewlett Packard",
 	    "PhotoSmart S20",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 3300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 5200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 6300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 5300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
-	    0,
-	    "Hewlett Packard",
 	    "Deskjet 970Cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
-	    0,
-	    "Hewlett Packard",
 	    "Photosmart P1100",
 	},
 	{
 	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
-	    0,
-	    "Hewlett Packard",
 	    "PhotoSmart C500",
 	},
 	{
 	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE,
-	    0,
-	    "IBM Corporation",
 	    "USB CD-ROM Drive",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
-	    0,
-	    "Inside Out Networks",
 	    "EdgePort/4 serial ports",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
-	    0,
-	    "In-System Design",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
-	    0,
-	    "In-System Design",
 	    "IDE adapter ISD110",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105,
-	    0,
-	    "In-System Design",
 	    "IDE adapter ISD105",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
-	    0,
-	    "In-System Design",
 	    "USB cable",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
-	    0,
-	    "Intel",
 	    "82930 test board",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA,
-	    0,
-	    "Intel",
 	    "Easy PC Camera",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
-	    0,
-	    "I/O Data",
 	    "USB ETTX",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
-	    0,
-	    "I/O Data",
 	    "USB ETT",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
-	    0,
-	    "Iomega",
 	    "Zip 100",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
-	    0,
-	    "Iomega",
 	    "Zip 250",
 	},
 	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
-	    0,
-	    "Kawasaki LSI",
 	    "USB Ethernet controller engine",
 	},
 	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
-	    0,
-	    "Kawatsu Semiconductor",
 	    "MiniHub 4000P",
 	},
 	{
 	    USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ,
-	    0,
-	    "Keisokugiken",
 	    "HKS-0200 USBDAQ",
 	},
 	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
-	    0,
-	    "Kawasaki LSI",
 	    "10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
-	    0,
-	    "Kensington",
 	    "Orbit USB/PS2 trackball",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_TURBOBALL,
-	    0,
-	    "Kensington",
 	    "TurboBall",
 	},
 	{
 	    USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX,
-	    0,
-	    "Kingston Technology",
 	    "KNU101TX Ethernet",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC220",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC260",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC265,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC265",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC290,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC290",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC240",
 	},
 	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280,
-	    0,
-	    "Eastman Kodak",
 	    "Digital Science DC280",
 	},
 	{
 	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
-	    0,
-	    "Konica",
 	    "Digital Color Camera",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE,
-	    0,
-	    "KYE Systems",
 	    "Niche mouse",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NETSCROLL,
-	    0,
-	    "KYE Systems",
 	    "Genius NetScroll mouse",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
-	    0,
-	    "KYE Systems",
 	    "Flight 2000 joystick",
 	},
 	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO,
-	    0,
-	    "KYE Systems",
 	    "ColorPage Vivid-Pro scanner",
 	},
 	{
 	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW,
-	    0,
-	    "LaCie",
 	    "CD R/W",
 	},
 	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
-	    0,
-	    "Lexmark International",
 	    "Optra S 2450",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
-	    0,
-	    "Linksys",
 	    "USB10T Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
-	    0,
-	    "Linksys",
 	    "USB100TX Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1,
-	    0,
-	    "Linksys",
 	    "USB100H1 Ethernet/HPNA",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA,
-	    0,
-	    "Linksys",
 	    "USB10TA Ethernet",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
-	    0,
-	    "Logitech",
-	    "M2452 keyboard",
+	    "M2452",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
-	    0,
-	    "Logitech",
-	    "M4848 mouse",
+	    "M4848",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_PAGESCAN,
-	    0,
-	    "Logitech",
 	    "PageScan",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMWEB,
-	    0,
-	    "Logitech",
 	    "QuickCam Web",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
-	    0,
-	    "Logitech",
 	    "QuickCam Pro",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP,
-	    0,
-	    "Logitech",
 	    "QuickCam Express",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
-	    0,
-	    "Logitech",
 	    "QuickCam",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
-	    0,
-	    "Logitech",
 	    "N43",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48,
-	    0,
-	    "Logitech",
 	    "N48 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47,
-	    0,
-	    "Logitech",
 	    "M-BA47 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE,
-	    0,
-	    "Logitech",
 	    "WingMan Gaming Mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
-	    0,
-	    "Logitech",
 	    "USB-PS/2 Trackball",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
-	    0,
-	    "Logitech",
 	    "WingMan GamePad Extreme",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
-	    0,
-	    "Logitech",
 	    "WingMan Force joystick",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
-	    0,
-	    "Logitech",
 	    "QuickCam Pro",
 	},
 	{
 	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
-	    0,
-	    "Lucent",
 	    "USS-720 evaluation kit",
 	},
 	{
 	    USB_VENDOR_MACALLY, USB_PRODUCT_MACALLY_MOUSE1,
-	    0,
-	    "Macally",
 	    "mouse",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,
-	    0,
-	    "MCT",
 	    "Hub",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,
-	    0,
-	    "MCT",
 	    "USB-232 Interface",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
-	    0,
-	    "Melco",
 	    "LU-ATX Ethernet",
 	},
 	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
-	    0,
-	    "Metricom",
 	    "Ricochet GS",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC,
-	    0,
-	    "Microsoft",
 	    "SideWinder Precision Pro",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIMOUSE,
-	    0,
-	    "Microsoft",
 	    "IntelliMouse",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_NATURALKBD,
-	    0,
-	    "Microsoft",
-	    "Natural Keyboard Elite",
+	    "Natural",
 	},
 	{
 	    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_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
-	    0,
-	    "Microsoft",
 	    "IntelliEye mouse",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
-	    0,
-	    "Microsoft",
-	    "Internet Keyboard Pro",
+	    "Internet Pro",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U,
-	    0,
-	    "Microtek",
 	    "ScanMaker X6 - X6U",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
-	    0,
-	    "Microtek",
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2,
-	    0,
-	    "Microtek",
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6,
-	    0,
-	    "Microtek",
 	    "Phantom C6 scanner",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL,
-	    0,
-	    "Microtek",
 	    "ScanMaker V6USL",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2,
-	    0,
-	    "Microtek",
 	    "ScanMaker V6USL",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL,
-	    0,
-	    "Microtek",
 	    "ScanMaker V6UL",
 	},
 	{
 	    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,
-	    0,
-	    "MultiTech",
-	    "MT5634ZBA-USB modem",
+	    "MT5634ZBA",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
-	    0,
-	    "Mustek Systems",
 	    "1200 CU scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU,
-	    0,
-	    "Mustek Systems",
 	    "600 CU scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB,
-	    0,
-	    "Mustek Systems",
 	    "1200 scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB,
-	    0,
-	    "Mustek Systems",
 	    "1200 UB scanner",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
-	    0,
-	    "Mustek Systems",
 	    "MDC-800 digital camera",
 	},
 	{
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW,
-	    0,
-	    "National Semiconductor",
 	    "BearPaw 1200",
 	},
 	{
 	    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",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
-	    0,
-	    "OmniVision",
 	    "OV511 Camera",
 	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511PLUS,
-	    0,
-	    "OmniVision",
 	    "OV511+ Camera",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
-	    0,
-	    "Palm Computing",
 	    "USB Serial Adaptor",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
-	    0,
-	    "Peracom Networks",
 	    "Serial Converter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
-	    0,
-	    "Peracom Networks",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3,
-	    0,
-	    "Peracom Networks",
 	    "At-Home Ethernet",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
-	    0,
-	    "Peracom Networks",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS350,
-	    0,
-	    "Philips",
 	    "DSS 350 Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS,
-	    0,
-	    "Philips",
 	    "DSS XXX Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_HUB,
-	    0,
-	    "Philips",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
-	    0,
-	    "Philips",
 	    "PCVC680K Vesta Pro PC Camera",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
-	    0,
-	    "Philips",
 	    "DSS 150 Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
-	    0,
-	    "P.I. Engineering",
 	    "PS2 to Mac Adapter",
 	},
 	{
 	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
-	    0,
-	    "PLX",
 	    "test board",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
-	    0,
-	    "Primax Electronics",
 	    "G2-200 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300,
-	    0,
-	    "Primax Electronics",
 	    "G2E-300 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300,
-	    0,
-	    "Primax Electronics",
 	    "G2-300 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002,
-	    0,
-	    "Primax Electronics",
 	    "G2E-300 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 9600 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 600u scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 19200 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 1200u scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600,
-	    0,
-	    "Primax Electronics",
 	    "G2-600 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I,
-	    0,
-	    "Primax Electronics",
 	    "ReadyScan 636i",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600,
-	    0,
-	    "Primax Electronics",
 	    "G2-600 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600,
-	    0,
-	    "Primax Electronics",
 	    "G2E-600 scanner",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT,
-	    0,
-	    "Primax Electronics",
 	    "Comfort",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_MOUSEINABOX,
-	    0,
-	    "Primax Electronics",
 	    "Mouse-in-a-Box",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_PCGAUMS1,
-	    0,
-	    "Primax Electronics",
 	    "Sony PCGA-UMS1",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301,
-	    0,
-	    "Prolific Technology",
 	    "PL2301 Host-Host interface",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302,
-	    0,
-	    "Prolific Technology",
 	    "PL2302 Host-Host interface",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4,
-	    0,
-	    "Prolific Technology",
 	    "ATAPI-4 Bridge Controller",
 	},
 	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
-	    0,
-	    "Qtronix",
-	    "Scorpion-980N keyboard",
+	    "Scorpion-980N",
 	},
 	{
 	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
-	    0,
-	    "Quickshot",
 	    "USB StrikePad",
 	},
 	{
 	    USB_VENDOR_RAINBOW, USB_PRODUCT_RAINBOW_IKEY2000,
-	    0,
-	    "Rainbow Technologies",
 	    "i-Key 2000",
 	},
 	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
-	    0,
-	    "Rockfire",
 	    "gamepad 203USB",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
-	    0,
-	    "SanDisk",
 	    "USB ImageMate",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
-	    0,
-	    "Shuttle Technology",
 	    "E-USB Bridge",
 	},
 	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
-	    0,
-	    "SIIG",
 	    "DigiFilm-Combo Reader",
 	},
 	{
 	    USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER,
-	    0,
-	    "Sirius Technologies",
 	    "NetComm Roadster II 56 USB",
 	},
 	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
-	    0,
-	    "SmartBridges",
 	    "SmartLink Ethernet",
 	},
 	{
 	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
-	    0,
-	    "Standard Microsystems",
 	    "10Mbps Ethernet",
 	},
 	{
 	    USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB,
-	    0,
-	    "Standard Microsystems",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD,
-	    0,
-	    "Solid Year",
-	    "Solid Year keyboard",
+	    "Keyboard",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
-	    0,
-	    "Sony",
 	    "Sony DSC Cameras",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
-	    0,
-	    "Sony",
-	    "Sony MSC Memorystick slot",
+	    "Sony MSC Memorystick Slot",
 	},
 	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
-	    0,
-	    "STMicroelectronics",
 	    "Communicator",
 	},
 	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
-	    0,
-	    "Sun Microsystems",
 	    "Type 6 USB",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
-	    0,
-	    "Diamond (Supra)",
-	    "Supra Express 56K modem",
+	    "Supra Express 56K",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRA2890,
-	    0,
-	    "Diamond (Supra)",
-	    "SupraMax 2890 56K Modem",
+	    "SupraMax 2890 56K",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB,
-	    0,
-	    "Diamond (Supra)",
 	    "Rio 600",
 	},
 	{
 	    USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,
-	    0,
-	    "TEAC",
-	    "FD-05PUB Floppy",
+	    "FD-05PUB",
 	},
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
-	    0,
-	    "Telex Communications",
 	    "Microphone",
 	},
 	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
-	    0,
-	    "Texas Instruments",
 	    "UT-USB41",
 	},
 	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
-	    0,
-	    "Thrustmaster",
 	    "Fusion Digital Gamepad",
 	},
 	{
 	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
-	    0,
-	    "Trek Technology",
 	    "ThumbDrive",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 1236U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 1220U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2000U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2100U Scanner",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2200U Scanner",
 	},
 	{
 	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
-	    0,
-	    "Universal Access",
 	    "Panache Surf ISDN Adapter",
 	},
 	{
 	    USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002,
-	    0,
-	    "VLSI Vision",
 	    "CPiA Camera",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600,
-	    0,
-	    "Visioneer",
 	    "OneTouch 7600",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300,
-	    0,
-	    "Visioneer",
 	    "OneTouch 5300",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100,
-	    0,
-	    "Visioneer",
 	    "OneTouch 6100",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200,
-	    0,
-	    "Visioneer",
 	    "OneTouch 6200",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100,
-	    0,
-	    "Visioneer",
 	    "OneTouch 8100",
 	},
 	{
 	    USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600,
-	    0,
-	    "Visioneer",
 	    "OneTouch 8600",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U,
-	    0,
-	    "WACOM",
 	    "CT-0405-U Tablet",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GRAPHIRE,
-	    0,
-	    "WACOM",
 	    "Graphire",
 	},
 	{
 	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOSA5,
-	    0,
-	    "WACOM",
 	    "Intuos A5",
 	},
 	{
 	    USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
-	    0,
-	    "Y-E Data",
 	    "Flashbuster-U",
 	},
 	{
 	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
-	    0,
-	    "Yano",
 	    "U640MO-03",
 	},
 	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
-	    0,
-	    "Zoom Telephonics",
-	    "2986L Fax modem",
+	    "2986L",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
-	    0,
-	    "ZyXEL Communication",
-	    "Scorpion-980N keyboard",
+	    "Scorpion-980N",
 	},
+	{ 0, 0, NULL }
+};
+
+struct usb_known_vendor usb_known_vendors[] = {
 	{
-	    USB_VENDOR_AOX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AOX,
 	    "AOX",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ATMEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ATMEL,
 	    "Atmel",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HP,
 	    "Hewlett Packard",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADAPTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADAPTEC,
 	    "Adaptec",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NATIONAL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NATIONAL,
 	    "National Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACERLABS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACERLABS,
 	    "Acer Labs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FTDI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FTDI,
 	    "Future Technology Devices",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NEC,
 	    "NEC",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KODAK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KODAK,
 	    "Eastman Kodak",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MELCO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MELCO,
 	    "Melco",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CREATIVELABS,
 	    "Creative Labs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADI,
 	    "ADI Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CATC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CATC,
 	    "Computer Access Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GRAVIS, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "Advanced Gravis Computer Tech.",
-	    NULL,
+	    USB_VENDOR_GRAVIS,
+	    "Advanced Gravis Computer",
 	},
 	{
-	    USB_VENDOR_SUN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SUN,
 	    "Sun Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AMD, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AMD,
 	    "Advanced Micro Devices",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LEXMARK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LEXMARK,
 	    "Lexmark International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NANAO, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "NANAO Corp.",
-	    NULL,
+	    USB_VENDOR_NANAO,
+	    "NANAO",
 	},
 	{
-	    USB_VENDOR_ALPS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALPS,
 	    "Alps Electric",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_THRUST, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_THRUST,
 	    "Thrustmaster",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TI,
 	    "Texas Instruments",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANALOGDEVICES, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANALOGDEVICES,
 	    "Analog Devices",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KYE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KYE,
 	    "KYE Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DIAMOND2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DIAMOND2,
 	    "Diamond (Supra)",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MICROSOFT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MICROSOFT,
 	    "Microsoft",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PRIMAX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PRIMAX,
 	    "Primax Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AMP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AMP,
 	    "AMP",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CHERRY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CHERRY,
 	    "Cherry Mikroschalter",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MEGATRENDS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MEGATRENDS,
 	    "American Megatrends",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LOGITECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LOGITECH,
 	    "Logitech",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BTC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BTC,
 	    "Behavior Tech. Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PHILIPS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PHILIPS,
 	    "Philips",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CONNECTIX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CONNECTIX,
 	    "Connectix",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KENSINGTON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KENSINGTON,
 	    "Kensington",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LUCENT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LUCENT,
 	    "Lucent",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_STMICRO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_STMICRO,
 	    "STMicroelectronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_COMPAQ, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "Compaq Computers",
-	    NULL,
+	    USB_VENDOR_COMPAQ,
+	    "Compaq",
 	},
 	{
-	    USB_VENDOR_ACERP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACERP,
 	    "Acer Peripherals",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_VISIONEER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_VISIONEER,
 	    "Visioneer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CANON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CANON,
 	    "Canon",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IBM, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "IBM Corporation",
-	    NULL,
+	    USB_VENDOR_IBM,
+	    "IBM",
 	},
 	{
-	    USB_VENDOR_CYPRESS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CYPRESS,
 	    "Cypress Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EPSON, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "Seiko Epson Corp.",
-	    NULL,
+	    USB_VENDOR_EPSON,
+	    "Seiko Epson",
 	},
 	{
-	    USB_VENDOR_RAINBOW, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_RAINBOW,
 	    "Rainbow Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IODATA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IODATA,
 	    "I/O Data",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_3COMUSR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_3COMUSR,
 	    "U.S. Robotics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_METHODE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_METHODE,
 	    "Methode Electronics Far East",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MAXISWITCH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MAXISWITCH,
 	    "Maxi Switch",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LOCKHEEDMER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LOCKHEEDMER,
 	    "Lockheed Martin Energy Research",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FUJITSU, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FUJITSU,
 	    "Fujitsu",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TOSHIBAAM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TOSHIBAAM,
 	    "Toshiba America Electronic Components",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MICROMACRO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MICROMACRO,
 	    "Micro Macro Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KONICA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KONICA,
 	    "Konica",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LITEON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LITEON,
 	    "Lite-On Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FUJIPHOTO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FUJIPHOTO,
 	    "Fuji Photo Film",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PHILIPSSEMI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PHILIPSSEMI,
 	    "Philips Semiconductors",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TATUNG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TATUNG,
 	    "Tatung Co. Of America",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SCANLOGIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SCANLOGIC,
 	    "ScanLogic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MYSON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MYSON,
 	    "Myson Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DIGI2, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "Digi International",
-	    NULL,
+	    USB_VENDOR_DIGI2,
+	    "Digi",
 	},
 	{
-	    USB_VENDOR_ITTCANON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ITTCANON,
 	    "ITT Canon",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
-	    "Altec Lansing Technologies",
-	    NULL,
+	    USB_VENDOR_ALTEC,
+	    "Altec Lansing",
 	},
 	{
-	    USB_VENDOR_SHUTTLE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SHUTTLE,
 	    "Shuttle Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANNABOOKS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANNABOOKS,
 	    "Annabooks",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CHICONY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CHICONY,
 	    "Chicony Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BROTHER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BROTHER,
 	    "Brother Industries",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DALLAS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DALLAS,
 	    "Dallas Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACER,
 	    "Acer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_3COM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_3COM,
 	    "3Com",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AZTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AZTECH,
 	    "Aztech Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BELKIN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BELKIN,
 	    "Belkin Components",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KAWATSU, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KAWATSU,
 	    "Kawatsu Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APC,
 	    "American Power Conversion",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CONNECTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CONNECTEK,
 	    "Advanced Connectek USA",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NETCHIP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NETCHIP,
 	    "NetChip Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALTRA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALTRA,
 	    "ALTRA",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ATI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ATI,
 	    "ATI Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AKS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AKS,
 	    "Aladdin Knowledge Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_UNIACCESS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_UNIACCESS,
 	    "Universal Access",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANCHOR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANCHOR,
 	    "Anchor Chips",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SONY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SONY,
 	    "Sony",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_VISION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_VISION,
 	    "VLSI Vision",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASAHIKASEI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASAHIKASEI,
 	    "Asahi Kasei Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ATEN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ATEN,
 	    "ATEN International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MUSTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MUSTEK,
 	    "Mustek Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TELEX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TELEX,
 	    "Telex Communications",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PERACOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PERACOM,
 	    "Peracom Networks",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALCOR2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALCOR2,
 	    "Alcor Micro",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_WACOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_WACOM,
 	    "WACOM",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ETEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ETEK,
 	    "e-TEK Labs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EIZO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EIZO,
 	    "EIZO",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ELECOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ELECOM,
 	    "Elecom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BAFO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BAFO,
 	    "BAFO/Quality Computer Accessories",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_YEDATA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_YEDATA,
 	    "Y-E Data",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AVM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AVM,
 	    "AVM",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_QUICKSHOT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_QUICKSHOT,
 	    "Quickshot",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ROCKFIRE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ROCKFIRE,
 	    "Rockfire",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ZYXEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ZYXEL,
 	    "ZyXEL Communication",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALCOR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALCOR,
 	    "Alcor Micro",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IOMEGA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IOMEGA,
 	    "Iomega",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ATREND, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ATREND,
 	    "A-Trend Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AID, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AID,
 	    "Advanced Input Devices",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LACIE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LACIE,
 	    "LaCie",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_OMNIVISION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_OMNIVISION,
 	    "OmniVision",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INSYSTEM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INSYSTEM,
 	    "In-System Design",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APPLE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APPLE,
 	    "Apple Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DIGI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DIGI,
 	    "Digi International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_QTRONIX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_QTRONIX,
 	    "Qtronix",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ELSA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ELSA,
 	    "ELSA",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BRAINBOXES, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BRAINBOXES,
 	    "Brainboxes Limited",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AXIOHM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AXIOHM,
 	    "Axiohm Transaction Solutions",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MICROTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MICROTEK,
 	    "Microtek",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SYMBOL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SYMBOL,
 	    "Symbol Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GENESYS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GENESYS,
 	    "Genesys Logic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FUJI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FUJI,
 	    "Fuji Electric",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KEITHLEY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KEITHLEY,
 	    "Keithley Instruments",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EIZONANAO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EIZONANAO,
 	    "EIZO Nanao",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KLSI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KLSI,
 	    "Kawasaki LSI",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FFC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FFC,
 	    "FFC Limited",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANKO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANKO,
 	    "Anko Electronic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PIENGINEERING, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PIENGINEERING,
 	    "P.I. Engineering",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AOC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AOC,
 	    "AOC International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CHIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CHIC,
 	    "Chic Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BARCO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BARCO,
 	    "Barco Display Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BRIDGE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BRIDGE,
 	    "Bridge Information",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SOLIDYEAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SOLIDYEAR,
 	    "Solid Year",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BIORAD, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BIORAD,
 	    "Bio-Rad Laboratories",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MACALLY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MACALLY,
 	    "Macally",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTLABS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTLABS,
 	    "Act Labs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALARIS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALARIS,
 	    "Alaris",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APEX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APEX,
 	    "Apex",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AVISION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AVISION,
 	    "Avision",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TEAC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TEAC,
 	    "TEAC",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LINKSYS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LINKSYS,
 	    "Linksys",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACERSA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACERSA,
 	    "Acer Semiconductor America",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AIWA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AIWA,
 	    "Aiwa",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACARD, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACARD,
 	    "ACARD Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PROLIFIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PROLIFIC,
 	    "Prolific Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADVANCELOGIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADVANCELOGIC,
 	    "Avance Logic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CTX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CTX,
 	    "Chuntex",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASKEY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASKEY,
 	    "Askey Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALCATELT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALCATELT,
 	    "Alcatel Telecom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AGFA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AGFA,
 	    "AGFA-Gevaert NV",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASIAMD, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASIAMD,
 	    "Asia Microelectronic Development",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BIZLINK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BIZLINK,
 	    "Bizlink International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AASHIMA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AASHIMA,
 	    "Aashima Technology B.V.",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MULTITECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MULTITECH,
 	    "MultiTech",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADS,
 	    "ADS Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALCATELM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALCATELM,
 	    "Alcatel Microelectronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SIRIUS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIRIUS,
 	    "Sirius Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BOSTON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BOSTON,
 	    "Boston Acoustics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SMC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SMC,
 	    "Standard Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MCT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MCT,
 	    "MCT",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AUREAL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AUREAL,
 	    "Aureal Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MIDIMAN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MIDIMAN,
 	    "Midiman",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GRIFFIN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GRIFFIN,
 	    "Griffin Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SANDISK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SANDISK,
 	    "SanDisk",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BRIMAX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BRIMAX,
 	    "Brimax",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AXIS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AXIS,
 	    "Axis Communications AB",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ABL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ABL,
 	    "ABL Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALFADATA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALFADATA,
 	    "Alfadata Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NATIONALTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NATIONALTECH,
 	    "National Technical Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ONNTO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ONNTO,
 	    "Onnto",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BE,
 	    "Be",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADMTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADMTEK,
 	    "ADMtek",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_COREGA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_COREGA,
 	    "Corega",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FREECOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FREECOM,
 	    "Freecom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MICROTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MICROTECH,
 	    "Microtech",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ABOCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ABOCOM,
 	    "AboCom Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KEISOKUGIKEN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KEISOKUGIKEN,
 	    "Keisokugiken",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APG,
 	    "APG Cash Drawer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BUG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BUG,
 	    "B.U.G.",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALLIEDTELESYN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALLIEDTELESYN,
 	    "Allied Telesyn International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AVERMEDIA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AVERMEDIA,
 	    "AVerMedia Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SIIG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIIG,
 	    "SIIG",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APTIO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APTIO,
 	    "Aptio Products",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ARASAN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ARASAN,
 	    "Arasan Chip Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALLIEDCABLE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALLIEDCABLE,
 	    "Allied Cable",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ZOOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ZOOM,
 	    "Zoom Telephonics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BROADLOGIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BROADLOGIC,
 	    "BroadLogic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HANDSPRING, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HANDSPRING,
 	    "Handspring",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTIONSTAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTIONSTAR,
 	    "Action Star Enterprise",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PALM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PALM,
 	    "Palm Computing",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACCTON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACCTON,
 	    "Accton Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DIAMOND, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DIAMOND,
 	    "Diamond",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NETGEAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NETGEAR,
 	    "BayNETGEAR",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTIVEWIRE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTIVEWIRE,
 	    "ActiveWire",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_METRICOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_METRICOM,
 	    "Metricom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADESSOKBTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADESSOKBTEK,
 	    "ADESSO/Kbtek America",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_APT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_APT,
 	    "APT Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BOCARESEARCH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BOCARESEARCH,
 	    "Boca Research",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANDREA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANDREA,
 	    "Andrea Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BURRBROWN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BURRBROWN,
 	    "Burr-Brown Japan",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_2WIRE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_2WIRE,
 	    "2Wire, Inc",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AIPTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AIPTEK,
 	    "AIPTEK International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SMARTBRIDGES, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SMARTBRIDGES,
 	    "SmartBridges",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BILLIONTON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BILLIONTON,
 	    "Billionton Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EXTENDED, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EXTENDED,
 	    "Extended Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AUTHENTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AUTHENTEC,
 	    "AuthenTec",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALATION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALATION,
 	    "Alation Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BIOMETRIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BIOMETRIC,
 	    "American Biometric Company",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_YANO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_YANO,
 	    "Yano",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KINGSTON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KINGSTON,
 	    "Kingston Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BLUEWATER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BLUEWATER,
 	    "BlueWater Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AGILENT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AGILENT,
 	    "Agilent Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADIRONDACK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADIRONDACK,
 	    "Adirondack Wire & Cable",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BECKHOFF, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BECKHOFF,
 	    "Beckhoff",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALTIUS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALTIUS,
 	    "Altius Solutions",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ARRIS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ARRIS,
 	    "Arris Interactive",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTIVCARD, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTIVCARD,
 	    "ACTIVCARD",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTISYS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTISYS,
 	    "ACTiSYS",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AFOURTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AFOURTECH,
 	    "A-FOUR TECH",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AIMEX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AIMEX,
 	    "AIMEX",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADDONICS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADDONICS,
 	    "Addonics Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AKAI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AKAI,
 	    "AKAI professional M.I.",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ARESCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ARESCOM,
 	    "ARESCOM",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BAY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BAY,
 	    "Bay Associates",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALTERA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALTERA,
 	    "Altera",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TREK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TREK,
 	    "Trek Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASAHIOPTICAL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASAHIOPTICAL,
 	    "Asahi Optical",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BOCASYSTEMS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BOCASYSTEMS,
 	    "Boca Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BROADCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BROADCOM,
 	    "Broadcom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GEOCAST, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GEOCAST,
 	    "Geocast Network Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MOTOROLA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MOTOROLA,
 	    "Motorola",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PLX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PLX,
 	    "PLX",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BELKIN2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BELKIN2,
 	    "Belkin Components",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_UMAX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_UMAX,
 	    "UMAX Data Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INSIDEOUT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INSIDEOUT,
 	    "Inside Out Networks",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ENTREGA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ENTREGA,
 	    "Entrega",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACTIONTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACTIONTEC,
 	    "Actiontec Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DLINK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DLINK,
 	    "D-Link",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INTEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INTEL,
 	    "Intel",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HP2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HP2,
 	    "Hewlett Packard",
-	    NULL,
 	},
-	{ 0, 0, 0, NULL, NULL, }
+	{ 0, NULL }
 };