Store the usb device names and vendors in more compact structures.

Originally committed in 2001, backed out in a sync, now back in.
saves close to 12k of kernel size. commit deraadt@

3 files changed, 428 insertions, 3046 deletions

diff --git a/sys/dev/usb/devlist2h.awk b/sys/dev/usb/devlist2h.awk
index 080d2ddc445..a360cb75895 100644
--- a/sys/dev/usb/devlist2h.awk
+++ b/sys/dev/usb/devlist2h.awk
@@ -1,5 +1,5 @@
 #! /usr/bin/awk -f
-#	$OpenBSD: devlist2h.awk,v 1.7 2001/10/31 04:24:44 nate Exp $
+#	$OpenBSD: devlist2h.awk,v 1.8 2005/10/17 18:00:43 drahn Exp $
 #	$NetBSD: devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -175,28 +175,13 @@ END {
 
 	printf("\n") > dfile
 
-	printf("const struct usb_knowndev usb_knowndevs[] = {\n") > dfile
+	printf("const struct usb_known_product usb_known_products[] = {\n") \
+	    > dfile
 	for (i = 1; i <= nproducts; i++) {
 		printf("\t{\n") > dfile
 		printf("\t    USB_VENDOR_%s, USB_PRODUCT_%s_%s,\n",
 		    products[i, 1], products[i, 1], products[i, 2]) \
 		    > dfile
-		printf("\t    ") > dfile
-		printf("0") > dfile
-		printf(",\n") > dfile
-
-		vendi = vendorindex[products[i, 1]];
-		printf("\t    \"") > dfile
-		j = 3;
-		needspace = 0;
-		while (vendors[vendi, j] != "") {
-			if (needspace)
-				printf(" ") > dfile
-			printf("%s", vendors[vendi, j]) > dfile
-			needspace = 1
-			j++
-		}
-		printf("\",\n") > dfile
 
 		printf("\t    \"") > dfile
 		j = 4;
@@ -211,12 +196,16 @@ END {
 		printf("\",\n") > dfile
 		printf("\t},\n") > dfile
 	}
+	printf("\t{ 0, 0, NULL }\n") > dfile
+	printf("};\n\n") > dfile
+
+	printf("const struct usb_known_vendor usb_known_vendors[] = {\n") \
+	     > dfile
 	for (i = 1; i <= nvendors; i++) {
 		printf("\t{\n") > dfile
-		printf("\t    USB_VENDOR_%s, 0,\n", vendors[i, 1]) \
-		    > dfile
-		printf("\t    USB_KNOWNDEV_NOPROD,\n") \
+		printf("\t    USB_VENDOR_%s,\n", vendors[i, 1]) \
 		    > dfile
+
 		printf("\t    \"") > dfile
 		j = 3;
 		needspace = 0;
@@ -228,9 +217,8 @@ END {
 			j++
 		}
 		printf("\",\n") > dfile
-		printf("\t    NULL,\n") > dfile
 		printf("\t},\n") > dfile
 	}
-	printf("\t{ 0, 0, 0, NULL, NULL, }\n") > dfile
+	printf("\t{ 0, NULL }\n") > dfile
 	printf("};\n") > dfile
 }
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index ceca07f3608..3a11114e216 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.39 2005/10/10 14:20:16 krw Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.40 2005/10/17 18:00:43 drahn Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -102,13 +102,16 @@ typedef u_int16_t usb_product_id_t;
 /*
  * Descriptions of of known vendors and devices ("products").
  */
-struct usb_knowndev {
+struct usb_known_vendor {
+	usb_vendor_id_t		vendor;
+	char			*vendorname;
+};
+
+struct usb_known_product {
 	usb_vendor_id_t		vendor;
 	usb_product_id_t	product;
-	int			flags;
-	char			*vendorname, *productname;
+	char			*productname;
 };
-#define	USB_KNOWNDEV_NOPROD	0x01		/* match on vendor only */
 
 #include <dev/usb/usbdevs_data.h>
 #endif /* USBVERBOSE */
@@ -252,7 +255,8 @@ usbd_devinfo_vp(usbd_device_handle dev, char *v, char *p, int usedev)
 	usb_device_descriptor_t *udd = &dev->ddesc;
 	char *vendor = 0, *product = 0;
 #ifdef USBVERBOSE
-	const struct usb_knowndev *kdp;
+	const struct usb_known_vendor *ukv;
+	const struct usb_known_product *ukp;
 #endif
 
 	if (dev == NULL) {
@@ -271,20 +275,24 @@ usbd_devinfo_vp(usbd_device_handle dev, char *v, char *p, int usedev)
 	}
 #ifdef USBVERBOSE
 	if (vendor == NULL || product == NULL) {
-		for(kdp = usb_knowndevs;
-		    kdp->vendorname != NULL;
-		    kdp++) {
-			if (kdp->vendor == UGETW(udd->idVendor) &&
-			    (kdp->product == UGETW(udd->idProduct) ||
-			     (kdp->flags & USB_KNOWNDEV_NOPROD) != 0))
+		for(ukv = usb_known_vendors;
+		    ukv->vendorname != NULL;
+		    ukv++) {
+			if (ukv->vendor == UGETW(udd->idVendor)) {
+				vendor = ukv->vendorname;
 				break;
+			}
 		}
-		if (kdp->vendorname != NULL) {
-			if (vendor == NULL)
-			    vendor = kdp->vendorname;
-			if (product == NULL)
-			    product = (kdp->flags & USB_KNOWNDEV_NOPROD) == 0 ?
-				kdp->productname : NULL;
+		if (vendor != NULL) {
+			for(ukp = usb_known_products;
+			    ukp->productname != NULL;
+			    ukp++) {
+				if (ukp->vendor == UGETW(udd->idVendor) &&
+				    (ukp->product == UGETW(udd->idProduct))) {
+					product = ukp->productname;
+					break;
+				}
+			}
 		}
 	}
 #endif
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 67615c1822f..321155bd5be 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.172 2005/09/29 01:18:33 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.173 2005/10/17 18:00:43 drahn Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -45,7860 +45,5246 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-const struct usb_knowndev usb_knowndevs[] = {
+const struct usb_known_product usb_known_products[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
-	    0,
-	    "3Com",
 	    "HomeConnect",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96,
-	    0,
-	    "3Com",
 	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
-	    0,
-	    "3Com",
 	    "3C19250 Ethernet",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3CRSHEW696,
-	    0,
-	    "3Com",
 	    "3CRSHEW696",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
-	    0,
-	    "3Com",
 	    "HomeConnect 3C460",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
-	    0,
-	    "3Com",
 	    "U.S.Robotics 56000",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B,
-	    0,
-	    "3Com",
 	    "HomeConnect 3C460B",
 	},
 	{
 	    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",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
-	    0,
-	    "U.S. Robotics",
 	    "U.S.Robotics 56000",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1,
-	    0,
-	    "AboCom Systems",
 	    "XX1",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2,
-	    0,
-	    "AboCom Systems",
 	    "XX2",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450,
-	    0,
-	    "AboCom Systems",
 	    "URE450 Ethernet",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000,
-	    0,
-	    "AboCom Systems",
 	    "UFE1000 Fast Ethernet",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA,
-	    0,
-	    "AboCom Systems",
 	    "1/10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4,
-	    0,
-	    "AboCom Systems",
 	    "XX4",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5,
-	    0,
-	    "AboCom Systems",
 	    "XX5",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6,
-	    0,
-	    "AboCom Systems",
 	    "XX6",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RTL8151,
-	    0,
-	    "AboCom Systems",
 	    "RTL8151",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7,
-	    0,
-	    "AboCom Systems",
 	    "XX7",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8,
-	    0,
-	    "AboCom Systems",
 	    "XX8",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9,
-	    0,
-	    "AboCom Systems",
 	    "XX9",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
-	    0,
-	    "AboCom Systems",
 	    "XX10",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_BWU613,
-	    0,
-	    "AboCom Systems",
 	    "BWU613",
 	},
 	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
-	    0,
-	    "Accton Technology",
 	    "USB320-EC Ethernet",
 	},
 	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_2664W,
-	    0,
-	    "Accton Technology",
 	    "2664W",
 	},
 	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_111,
-	    0,
-	    "Accton Technology",
 	    "T-Sinus 111 WLAN",
 	},
 	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001,
-	    0,
-	    "Accton Technology",
 	    "SpeedStream Ethernet",
 	},
 	{
 	    USB_VENDOR_ACERW, USB_PRODUCT_ACERW_WARPLINK,
-	    0,
-	    "Acer",
 	    "Warplink",
 	},
 	{
 	    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_ACERP, USB_PRODUCT_ACERP_ATAPI,
-	    0,
-	    "Acer Peripherals",
 	    "ATA/ATAPI",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL300,
-	    0,
-	    "Acer Peripherals",
 	    "AWL300",
 	},
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL400,
-	    0,
-	    "Acer Peripherals",
 	    "AWL400",
 	},
 	{
 	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25,
-	    0,
-	    "Actiontec Electronics",
 	    "Prism2.5 WLAN",
 	},
 	{
 	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25A,
-	    0,
-	    "Actiontec Electronics",
 	    "Prism2.5 WLAN A",
 	},
 	{
 	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_FREELAN,
-	    0,
-	    "Actiontec Electronics",
 	    "ROPEX FreeLan 802.11b",
 	},
 	{
 	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_802UAT1,
-	    0,
-	    "Actiontec Electronics",
 	    "802UAT1",
 	},
 	{
 	    USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
-	    0,
-	    "ACTiSYS",
 	    "ACT-IR2000U FIR",
 	},
 	{
 	    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_ADAPTEC, USB_PRODUCT_ADAPTEC_AWN8020,
-	    0,
-	    "Adaptec",
 	    "AWN-8020 WLAN",
 	},
 	{
 	    USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
-	    0,
-	    "Addonics Technology",
 	    "Cable 205",
 	},
 	{
 	    USB_VENDOR_ADDTRON, USB_PRODUCT_ADDTRON_AWU120,
-	    0,
-	    "Addtron",
 	    "AWU-120",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4,
-	    0,
-	    "ADMtek",
 	    "AN986A Ethernet",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
-	    0,
-	    "ADMtek",
 	    "AN986 Ethernet",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII,
-	    0,
-	    "ADMtek",
 	    "AN8511 Ethernet",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2,
-	    0,
-	    "ADMtek",
 	    "AN8513 Ethernet",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3,
-	    0,
-	    "ADMtek",
 	    "AN8515 Ethernet",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
-	    0,
-	    "ADS Technologies",
 	    "UBS-10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX,
-	    0,
-	    "ADS Technologies",
 	    "UBS-10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET,
-	    0,
-	    "AEI",
 	    "Fast Ethernet",
 	},
 	{
 	    USB_VENDOR_AGATE, USB_PRODUCT_AGATE_QDRIVE,
-	    0,
-	    "Agate Technologies",
 	    "Q-Drive",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan 1236U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan Touch",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan 1212U",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e40",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e50",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e20",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e25",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e26",
 	},
 	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52,
-	    0,
-	    "AGFA-Gevaert",
 	    "SnapScan e52",
 	},
 	{
 	    USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220,
-	    0,
-	    "Airprime",
 	    "AirPrime CDMA Wireless EVDO card",
 	},
 	{
 	    USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B,
-	    0,
-	    "Aincomm",
 	    "AWU2000B",
 	},
 	{
 	    USB_VENDOR_PHEENET, USB_PRODUCT_PHEENET_WM168B,
-	    0,
-	    "Pheenet",
 	    "WM-168b",
 	},
 	{
 	    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",
 	},
 	{
 	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_NEC_KBD_HUB,
-	    0,
-	    "Alcor Micro",
 	    "NEC Kbd Hub",
 	},
 	{
 	    USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100,
-	    0,
-	    "Allied Telesyn International",
 	    "AT-USB100",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
-	    0,
-	    "Altec Lansing",
 	    "ADA70 Speakers",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
-	    0,
-	    "Altec Lansing",
 	    "ASC495 Speakers",
 	},
 	{
 	    USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_WLAN,
-	    0,
-	    "Ambit Microsystems",
 	    "WLAN",
 	},
 	{
 	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
-	    0,
-	    "American Power Conversion",
 	    "Back-UPS Pro 500",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI,
-	    0,
-	    "Analog Devices",
 	    "Eagle I",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI_NF,
-	    0,
-	    "Analog Devices",
 	    "Eagle I",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII,
-	    0,
-	    "Analog Devices",
 	    "Eagle II",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII_NF,
-	    0,
-	    "Analog Devices",
 	    "Eagle II",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC,
-	    0,
-	    "Analog Devices",
 	    "Eagle IIC",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC_NF,
-	    0,
-	    "Analog Devices",
 	    "Eagle IIC",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII,
-	    0,
-	    "Analog Devices",
 	    "Eagle III",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII_NF,
-	    0,
-	    "Analog Devices",
 	    "Eagle III",
 	},
 	{
 	    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",
 	    "Ethernet",
 	},
 	{
 	    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_ARANEUS, USB_PRODUCT_ARANEUS_ALEA,
-	    0,
-	    "Araneus Information Systems",
 	    "True Random Number Generator",
 	},
 	{
 	    USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230,
-	    0,
-	    "Asahi Optical",
 	    "PENTAX Optio230",
 	},
 	{
 	    USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA,
-	    0,
-	    "Asante",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_WLL013I,
-	    0,
-	    "Askey Computer",
 	    "WLL013 (Intersil)",
 	},
 	{
 	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_WLL013,
-	    0,
-	    "Askey Computer",
 	    "WLL013",
 	},
 	{
 	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_VOYAGER1010,
-	    0,
-	    "Askey Computer",
 	    "Voyager 1010",
 	},
 	{
 	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172,
-	    0,
-	    "ASIX Electronics",
 	    "USB 2.0 10/100 ethernet controller",
 	},
 	{
 	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178,
-	    0,
-	    "ASIX Electronics",
 	    "AX88178",
 	},
 	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2570,
-	    0,
-	    "ASUS",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2570_2,
-	    0,
-	    "ASUS",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL140,
-	    0,
-	    "ASUSTeK Computer",
 	    "WL-140",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
-	    0,
-	    "ATEN International",
 	    "Parallel",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
-	    0,
-	    "ATEN International",
 	    "10Mbps Ethernet",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T,
-	    0,
-	    "ATEN International",
 	    "UC-110T Ethernet",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
-	    0,
-	    "ATEN International",
 	    "Serial",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T,
-	    0,
-	    "ATEN International",
 	    "UC210T Ethernet",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C,
-	    0,
-	    "ATEN International",
 	    "DSB-650C",
 	},
 	{
 	    USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205,
-	    0,
-	    "ATI",
 	    "USB Cable 205",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
-	    0,
-	    "Atmel",
 	    "UHB124 hub",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WN210,
-	    0,
-	    "Atmel",
 	    "W-Buddie WN210",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL900AP,
-	    0,
-	    "Atmel",
 	    "DWL-900AP Wireless access point",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I1,
-	    0,
-	    "Atmel",
 	    "AT76C503 (Intersil 3861 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I2,
-	    0,
-	    "Atmel",
 	    "AT76C503 (Intersil 3863 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503RFMD,
-	    0,
-	    "Atmel",
 	    "AT76C503 (RFMD Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD,
-	    0,
-	    "Atmel",
 	    "AT76C505 (RFMD Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD2958,
-	    0,
-	    "Atmel",
 	    "AT76C505 (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
-	    0,
-	    "Atmel",
 	    "AT76C505A (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505AS,
-	    0,
-	    "Atmel",
 	    "AT76C505AS (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
-	    0,
-	    "Audio-Technica",
 	    "ATC-HA4USB USB headphone",
 	},
 	{
 	    USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO,
-	    0,
-	    "Avance Logic",
 	    "USB Audio Speaker",
 	},
 	{
 	    USB_VENDOR_AVERATEC, USB_PRODUCT_AVERATEC_USBWLAN,
-	    0,
-	    "Averatec",
 	    "WLAN",
 	},
 	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
-	    0,
-	    "Avision",
 	    "1200U",
 	},
 	{
 	    USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4,
-	    0,
-	    "B&B Electronics",
 	    "uLinks RS-422/485",
 	},
 	{
 	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
-	    0,
-	    "Belkin Components",
 	    "F5U002 Parallel",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D6050,
-	    0,
-	    "Belkin Components",
 	    "F5D6050 802.11b Wireless adapter",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_FBT003V,
-	    0,
-	    "Belkin Components",
 	    "FBT003v2 Bluetooth",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103,
-	    0,
-	    "Belkin Components",
 	    "F5U103 Serial",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109,
-	    0,
-	    "Belkin Components",
 	    "F5U109 Serial",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
-	    0,
-	    "Belkin Components",
 	    "F5U409 Serial",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
-	    0,
-	    "Belkin Components",
 	    "SCSI",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN,
-	    0,
-	    "Belkin Components",
 	    "USB to LAN Converter",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U237,
-	    0,
-	    "Belkin Components",
 	    "F5U237 USB 2.0 7-Port Hub",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120,
-	    0,
-	    "Belkin Components",
 	    "F5U120-PC Hub",
 	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050,
-	    0,
-	    "Belkin Components",
 	    "F5D7050 54g USB Network Adapter",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
-	    0,
-	    "Billionton Systems",
 	    "USB100N 10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100,
-	    0,
-	    "Billionton Systems",
 	    "USB100LP",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100,
-	    0,
-	    "Billionton Systems",
 	    "USB100EL",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100,
-	    0,
-	    "Billionton Systems",
 	    "USBE100",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR,
-	    0,
-	    "Billionton Systems",
 	    "USB2AR Ethernet",
 	},
 	{
 	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
-	    0,
-	    "Broadcom",
 	    "BCM2033",
 	},
 	{
 	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF,
-	    0,
-	    "Broadcom",
 	    "BCM2033 (no fw)",
 	},
 	{
 	    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/Mouse",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
-	    0,
-	    "Canon",
 	    "CANOSCAN N656U",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U,
-	    0,
-	    "Canon",
 	    "CANOSCAN N670U",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
-	    0,
-	    "Canon",
 	    "PowerShot S10",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S20,
-	    0,
-	    "Canon",
 	    "PowerShot S20",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100_US,
-	    0,
-	    "Canon",
 	    "PowerShot S100",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100_EU,
-	    0,
-	    "Canon",
 	    "PowerShot S100",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_G1,
-	    0,
-	    "Canon",
 	    "PowerShot G1",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_A20,
-	    0,
-	    "Canon",
 	    "PowerShot A20",
 	},
 	{
 	    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_CASIO, USB_PRODUCT_CASIO_QV,
-	    0,
-	    "CASIO",
 	    "QV",
 	},
 	{
 	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300,
-	    0,
-	    "CASIO",
 	    "BE-300 PDA",
 	},
 	{
 	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND,
-	    0,
-	    "CASIO",
 	    "CASIO Nameland EZ-USB",
 	},
 	{
 	    USB_VENDOR_CCYU, USB_PRODUCT_CCYU_EASYDISK,
-	    0,
-	    "CCYU Technology",
 	    "EasyDisk Portable",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
-	    0,
-	    "Cherry Mikroschalter",
 	    "My3000 keyboard",
 	},
 	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB,
-	    0,
-	    "Cherry Mikroschalter",
 	    "My3000 hub",
 	},
 	{
 	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_MOUSE1,
-	    0,
-	    "Chic Technology",
 	    "mouse",
 	},
 	{
 	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS,
-	    0,
-	    "Chic Technology",
 	    "Cypress",
 	},
 	{
 	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
-	    0,
-	    "Chicony Electronics",
 	    "KB-8933 keyboard",
 	},
 	{
 	    USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROTHROTTLE,
-	    0,
-	    "CH Products",
 	    "Pro Throttle",
 	},
 	{
 	    USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROPEDALS,
-	    0,
-	    "CH Products",
 	    "Pro Pedals",
 	},
 	{
 	    USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK,
-	    0,
-	    "CH Products",
 	    "Fighterstick",
 	},
 	{
 	    USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE,
-	    0,
-	    "CH Products",
 	    "Flight Sim Yoke",
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G,
-	    0,
-	    "Cisco-Linksys",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP,
-	    0,
-	    "Cisco-Linksys",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2,
-	    0,
-	    "Cisco-Linksys",
 	    "USB200M v2",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
-	    0,
-	    "Compaq",
 	    "iPAQ PocketPC",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_A1500,
-	    0,
-	    "Compaq",
 	    "A1500",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQWLAN,
-	    0,
-	    "Compaq",
 	    "iPAQ WLAN",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W100,
-	    0,
-	    "Compaq",
 	    "W100",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W200,
-	    0,
-	    "Compaq",
 	    "WLAN MultiPort W200",
 	},
 	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100,
-	    0,
-	    "Compaq",
 	    "Personal Jukebox PJB100",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_SNAPPORT,
-	    0,
-	    "Billionton Systems",
 	    "SnapPort Ethernet",
 	},
 	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C11U,
-	    0,
-	    "Conceptronic",
 	    "C11U",
 	},
 	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_WL210,
-	    0,
-	    "Conceptronic",
 	    "WL-210",
 	},
 	{
 	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU,
-	    0,
-	    "Conceptronic",
 	    "C54RU WLAN",
 	},
 	{
 	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
-	    0,
-	    "Concord Camera",
 	    "Eye Q 3x",
 	},
 	{
 	    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_COREGA, USB_PRODUCT_COREGA_WLAN_USB_USB_11,
-	    0,
-	    "Corega",
 	    "WirelessLAN USB-11",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS,
-	    0,
-	    "Corega",
 	    "FEther USB-TXS",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLANUSB,
-	    0,
-	    "Corega",
 	    "Wireless LAN Stick-11",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX,
-	    0,
-	    "Corega",
 	    "FEther USB2-TX",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_KEY,
-	    0,
-	    "Corega",
 	    "ULUSB-11 Key",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_STICK,
-	    0,
-	    "Corega",
 	    "WLAN USB Stick 11",
 	},
 	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
-	    0,
-	    "Corega",
 	    "FEther USB-TXC",
 	},
 	{
 	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
-	    0,
-	    "Creative Labs",
 	    "Nomad II",
 	},
 	{
 	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_IIMG,
-	    0,
-	    "Creative Labs",
 	    "Nomad II MG",
 	},
 	{
 	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD,
-	    0,
-	    "Creative Labs",
 	    "Nomad",
 	},
 	{
 	    USB_VENDOR_CREATIVE2, USB_PRODUCT_CREATIVE2_VOIP_BLASTER,
-	    0,
-	    "Creative Labs",
 	    "Voip Blaster",
 	},
 	{
 	    USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH,
-	    0,
-	    "Cambridge Silicon Radio",
 	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUECORE,
-	    0,
-	    "Cambridge Silicon Radio",
 	    "BlueCore",
 	},
 	{
 	    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_KBDHUB,
-	    0,
-	    "Cypress Semiconductor",
 	    "Keyboard/Hub",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
-	    0,
-	    "Cypress Semiconductor",
 	    "FM Radio",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_USBRS232,
-	    0,
-	    "Cypress Semiconductor",
 	    "RS232",
 	},
 	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_HUB2,
-	    0,
-	    "Cypress Semiconductor",
 	    "USB2 Hub",
 	},
 	{
 	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
-	    0,
-	    "Daisy Technology",
 	    "PhotoClip",
 	},
 	{
 	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
-	    0,
-	    "Dallas Semiconductor",
 	    "J-6502 speakers",
 	},
 	{
 	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
-	    0,
-	    "Dallas Semiconductor",
 	    "USB-FOB/iBUTTON",
 	},
 	{
 	    USB_VENDOR_DELL, USB_PRODUCT_DELL_TM1180,
-	    0,
-	    "Dell",
 	    "TrueMobile 1180 WLAN",
 	},
 	{
 	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
-	    0,
-	    "Diamond",
 	    "Rio 500",
 	},
 	{
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_WL200U,
-	    0,
-	    "Dick Smith Electronics",
 	    "WL-200U",
 	},
 	{
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_CHUSB611G,
-	    0,
-	    "Dick Smith Electronics",
 	    "CHUSB 611G",
 	},
 	{
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_WL240U,
-	    0,
-	    "Dick Smith Electronics",
 	    "WL-240U",
 	},
 	{
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_XH1153,
-	    0,
-	    "Dick Smith Electronics",
 	    "XH1153 802.11b",
 	},
 	{
 	    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_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
-	    0,
-	    "Digital Stream",
 	    "PS/2 Active",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100,
-	    0,
-	    "D-Link",
 	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4,
-	    0,
-	    "D-Link",
 	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL120E,
-	    0,
-	    "D-Link",
 	    "DWL-120 rev E",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
-	    0,
-	    "D-Link",
 	    "DWL-122",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL120F,
-	    0,
-	    "D-Link",
 	    "DWL-120 rev F",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RT2570,
-	    0,
-	    "D-Link",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
-	    0,
-	    "D-Link",
 	    "10Mbps ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1,
-	    0,
-	    "D-Link",
 	    "10/100 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_DSB650TX3,
-	    0,
-	    "D-Link",
 	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2,
-	    0,
-	    "D-Link",
 	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
-	    0,
-	    "D-Link",
 	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
-	    0,
-	    "DMI",
 	    "Storage Adapter",
 	},
 	{
 	    USB_VENDOR_EASYDISK, USB_PRODUCT_EASYDISK_EASYDISK,
-	    0,
-	    "EasyDisk",
 	    "Flash Disk",
 	},
 	{
 	    USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
-	    0,
-	    "Eicon Networks",
 	    "Diva 852 ISDN TA",
 	},
 	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
-	    0,
-	    "EIZO",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
-	    0,
-	    "EIZO",
 	    "monitor",
 	},
 	{
 	    USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN,
-	    0,
-	    "ELCON Systemtechnik",
 	    "Goldpfeil P-LAN",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
-	    0,
-	    "Elecom",
 	    "29UO",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0,
-	    0,
-	    "Elecom",
 	    "LD-USB/TX",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1,
-	    0,
-	    "Elecom",
 	    "LD-USB/TX",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX,
-	    0,
-	    "Elecom",
 	    "LD-USBL/TX",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
-	    0,
-	    "Elecom",
 	    "LD-USB/TX",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT,
-	    0,
-	    "Elecom",
 	    "UC-SGT Serial",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0,
-	    0,
-	    "Elecom",
 	    "UC-SGT0 Serial",
 	},
 	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3,
-	    0,
-	    "Elecom",
 	    "LD-USB/TX",
 	},
 	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
-	    0,
-	    "ELSA",
 	    "ELSA",
 	},
 	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET,
-	    0,
-	    "ELSA",
 	    "Microlink USB2Ethernet",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
-	    0,
-	    "Entrega",
 	    "1S serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2S,
-	    0,
-	    "Entrega",
 	    "2S serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S25,
-	    0,
-	    "Entrega",
 	    "1S25 serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_4S,
-	    0,
-	    "Entrega",
 	    "4S serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45,
-	    0,
-	    "Entrega",
 	    "E45 Ethernet",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
-	    0,
-	    "Entrega",
 	    "Centronics",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1,
-	    0,
-	    "Entrega",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9,
-	    0,
-	    "Entrega",
 	    "1S9 serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB,
-	    0,
-	    "Entrega",
 	    "EZ-USB",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2U4S,
-	    0,
-	    "Entrega",
 	    "2U4S serial",
 	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2,
-	    0,
-	    "Entrega",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
-	    0,
-	    "Seiko Epson",
 	    "USB Printer",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2,
-	    0,
-	    "Seiko Epson",
 	    "ISD Smart Cable for Mac",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
-	    0,
-	    "Seiko Epson",
 	    "ISD Smart Cable",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER5,
-	    0,
-	    "Seiko Epson",
 	    "USB Printer",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 636U / 636Photo",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 610",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1200U / 1200Photo",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
-	    0,
-	    "Seiko Epson",
 	    "Expression 1600",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1640SU",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1240U / 1240Photo",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 640U",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1650",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F,
-	    0,
-	    "Seiko Epson",
 	    "GT-9700F",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2400,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 2400",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1260",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660,
-	    0,
-	    "Seiko Epson",
 	    "Perfection 1660",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
-	    0,
-	    "e-TEK Labs",
 	    "Serial",
 	},
 	{
 	    USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS,
-	    0,
-	    "Extended Systems",
 	    "XTNDAccess IrDA",
 	},
 	{
 	    USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST,
-	    0,
-	    "Falcom Wireless Communications GmbH",
 	    "Falcom Twist USB",
 	},
 	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
-	    0,
-	    "Freecom",
 	    "Connector for DVD drive",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM,
-	    0,
-	    "Future Technology Devices",
 	    "8U232AM Serial",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C,
-	    0,
-	    "Future Technology Devices",
 	    "2232C Serial",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
-	    0,
-	    "Future Technology Devices",
 	    "PS/2 Keyboard/Mouse",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX,
-	    0,
-	    "Future Technology Devices",
 	    "Serial",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200,
-	    0,
-	    "Future Technology Devices",
 	    "Matrix Orbital MX200 Series LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24,
-	    0,
-	    "Future Technology Devices",
 	    "Matrix Orbital LK202-24 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK204_24,
-	    0,
-	    "Future Technology Devices",
 	    "Matrix Orbital LK204-24 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_631,
-	    0,
-	    "Future Technology Devices",
 	    "Crystalfontz CFA-631 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
-	    0,
-	    "Future Technology Devices",
 	    "Crystalfontz CFA-632 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
-	    0,
-	    "Future Technology Devices",
 	    "Crystalfontz CFA-633 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
-	    0,
-	    "Future Technology Devices",
 	    "Crystalfontz CFA-634 LCD",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
-	    0,
-	    "Future Technology Devices",
 	    "SEMC DSS-20 SyncStation",
 	},
 	{
 	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
-	    0,
-	    "Fuji Photo Film",
 	    "Mass Storage",
 	},
 	{
 	    USB_VENDOR_FUJITSU, USB_PRODUCT_FUJITSU_AH_F401U,
-	    0,
-	    "Fujitsu",
 	    "AH-F401U Air H device",
 	},
 	{
 	    USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00,
-	    0,
-	    "G.Mate",
 	    "YP3X00 PDA",
 	},
 	{
 	    USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE3600,
-	    0,
-	    "Garmin International",
 	    "Ique 3600",
 	},
 	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK,
-	    0,
-	    "Genesys Logic",
 	    "GeneLink Host-Host Bridge",
 	},
 	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
-	    0,
-	    "Genesys Logic",
 	    "GL650 Hub",
 	},
 	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
-	    0,
-	    "Genesys Logic",
 	    "GL641USB CompactFlash",
 	},
 	{
 	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W,
-	    0,
-	    "GIGABYTE",
 	    "GN-BR402W",
 	},
 	{
 	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWLBM101,
-	    0,
-	    "GIGABYTE",
 	    "GN-WLBM101",
 	},
 	{
 	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG,
-	    0,
-	    "GIGABYTE",
 	    "GN-WBKG",
 	},
 	{
 	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_WLAN,
-	    0,
-	    "Gigaset",
 	    "WLAN",
 	},
 	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
-	    0,
-	    "GoHubs",
 	    "GoCOM232 Serial converter",
 	},
 	{
 	    USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_GWUSB2E,
-	    0,
-	    "Good Way Technology",
 	    "GWUSB2E",
 	},
 	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
-	    0,
-	    "Advanced Gravis Computer",
 	    "GamePad Pro",
 	},
 	{
 	    USB_VENDOR_GREENHOUSE, USB_PRODUCT_GREENHOUSE_KANA21,
-	    0,
-	    "GREENHOUSE",
 	    "CF-writer/MP3 Player",
 	},
 	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
-	    0,
-	    "Griffin Technology",
 	    "iMate, ADB adapter",
 	},
 	{
 	    USB_VENDOR_GUDE, USB_PRODUCT_GUDE_DCF,
-	    0,
-	    "Gude ADS",
 	    "Expert mouseCLOCK USB",
 	},
 	{
 	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_DALEADER,
-	    0,
-	    "Guillemot",
 	    "DA Leader",
 	},
 	{
 	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254,
-	    0,
-	    "Guillemot",
 	    "HWGUSB2-54 WLAN",
 	},
 	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
-	    0,
-	    "Hagiwara Sys-Com",
 	    "FlashGate SmartMedia",
 	},
 	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGCF,
-	    0,
-	    "Hagiwara Sys-Com",
 	    "FlashGate CompactFlash",
 	},
 	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG,
-	    0,
-	    "Hagiwara Sys-Com",
 	    "FlashGate",
 	},
 	{
 	    USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001,
-	    0,
-	    "HAL Corporation",
 	    "Crossam2+USB IR commander",
 	},
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
-	    0,
-	    "Handspring",
 	    "Handspring Visor",
 	},
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO,
-	    0,
-	    "Handspring",
 	    "Handspring Treo",
 	},
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600,
-	    0,
-	    "Handspring",
 	    "Handspring Treo 600",
 	},
 	{
 	    USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM,
-	    0,
-	    "Hauppauge Computer Works",
 	    "WinTV FM",
 	},
 	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
-	    0,
-	    "Hawking",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UF200,
-	    0,
-	    "AboCom Systems",
 	    "UF200 Ethernet",
 	},
 	{
 	    USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DZMV100A,
-	    0,
-	    "Hitachi",
 	    "DVD-CAM DZ-MV100A Camcorder",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 895C",
 	},
 	{
 	    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_880C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 880C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 4200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS,
-	    0,
-	    "Hewlett Packard",
 	    "CD-Writer Plus",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_KBDHUB,
-	    0,
-	    "Hewlett Packard",
 	    "Multimedia Keyboard Hub",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_HN210W,
-	    0,
-	    "Hewlett Packard",
 	    "HN210W",
 	},
 	{
 	    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_815C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 815C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 3300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200,
-	    0,
-	    "Hewlett Packard",
 	    "CD-Writer Plus 8200e",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_1220C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 1220C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_810C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 810C/812C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4300C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 4300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_CD4E,
-	    0,
-	    "Hewlett Packard",
 	    "CD-Writer+ CD-4e",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
-	    0,
-	    "Hewlett Packard",
 	    "OfficeJet G85xi",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_1200,
-	    0,
-	    "Hewlett Packard",
 	    "LaserJet 1200",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 5200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_830C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 830C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 3400cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_885C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 885C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 6300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_840C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 840c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_2200C,
-	    0,
-	    "Hewlett Packard",
 	    "ScanJet 2200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 5300C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_816C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 816C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
-	    0,
-	    "Hewlett Packard",
 	    "Deskjet 970Cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
-	    0,
-	    "Hewlett Packard",
 	    "Scanjet 5400C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_959C,
-	    0,
-	    "Hewlett Packard",
 	    "Deskjet 959C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 930c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P2000U,
-	    0,
-	    "Hewlett Packard",
 	    "Inkjet P-2000U",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
-	    0,
-	    "Hewlett Packard",
 	    "DeskJet 640c",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
-	    0,
-	    "Hewlett Packard",
 	    "Photosmart P1100",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_HN210E,
-	    0,
-	    "Hewlett Packard",
 	    "HN210E Ethernet",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_2215,
-	    0,
-	    "Hewlett Packard",
 	    "iPAQ 22xx/Jornada 548",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_568J,
-	    0,
-	    "Hewlett Packard",
 	    "Jornada 568",
 	},
 	{
 	    USB_VENDOR_HP2, USB_PRODUCT_HP2_C500,
-	    0,
-	    "Hewlett Packard",
 	    "PhotoSmart C500",
 	},
 	{
 	    USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE,
-	    0,
-	    "IBM",
 	    "Optical",
 	},
 	{
 	    USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE,
-	    0,
-	    "IBM",
 	    "CD-ROM",
 	},
 	{
 	    USB_VENDOR_IIYAMA, USB_PRODUCT_IIYAMA_HUB,
-	    0,
-	    "Iiyama",
 	    "Hub",
 	},
 	{
 	    USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO,
-	    0,
-	    "Imation",
 	    "Flash Go!",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
-	    0,
-	    "Inside Out Networks",
 	    "EdgePort/4 RS232",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT7,
-	    0,
-	    "Inside Out Networks",
 	    "Hubport/7",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_RAPIDPORT4,
-	    0,
-	    "Inside Out Networks",
 	    "Rapidport/4",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4T,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/4 RS232",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/2 RS232",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4I,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/4 RS422",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2I,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/2 RS422/RS485",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_HUBPORT4,
-	    0,
-	    "Inside Out Networks",
 	    "Hubport/4",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND,
-	    0,
-	    "Inside Out Networks",
 	    "Hand-built Edgeport/8",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MULTIMODEM,
-	    0,
-	    "Inside Out Networks",
 	    "MultiTech version of RP/4",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/(4)21 Parallel",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT421,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/421 Hub+RS232+Parallel",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT21,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/21 RS232+Parallel",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8DC,
-	    0,
-	    "Inside Out Networks",
 	    "1/2 Edgeport/8",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/8",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT2DIN,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/2 RS232/DIN",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4DIN,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/4 RS232/DIN",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT16DC,
-	    0,
-	    "Inside Out Networks",
 	    "1/2 Edgeport/16",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTCOMP,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport Compatible",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT8I,
-	    0,
-	    "Inside Out Networks",
 	    "Edgeport/8 RS422",
 	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_MT4X56USB,
-	    0,
-	    "Inside Out Networks",
 	    "OEM device",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002,
-	    0,
-	    "In-System Design",
 	    "Parallel",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI,
-	    0,
-	    "In-System Design",
 	    "ATAPI",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2,
-	    0,
-	    "In-System Design",
 	    "USB2 Storage",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
-	    0,
-	    "In-System Design",
 	    "IDE ISD110",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105,
-	    0,
-	    "In-System Design",
 	    "IDE ISD105",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2,
-	    0,
-	    "In-System Design",
 	    "Portable USB Harddrive V2",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2_5,
-	    0,
-	    "In-System Design",
 	    "Portable USB Harddrive V2",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
-	    0,
-	    "In-System Design",
 	    "USB cable",
 	},
 	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ADAPTERV2,
-	    0,
-	    "In-System Design",
 	    "USB Storage Adapter V2",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA,
-	    0,
-	    "Intel",
 	    "EasyPC",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_AP310,
-	    0,
-	    "Intel",
 	    "AP310 AnyPoint II",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_I2011B,
-	    0,
-	    "Intel",
 	    "Wireless 2011B",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
-	    0,
-	    "Intel",
 	    "82930 test board",
 	},
 	{
 	    USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_2X,
-	    0,
-	    "Intersil",
 	    "Prism2.x WLAN",
 	},
 	{
 	    USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN,
-	    0,
-	    "Intrepid",
 	    "ValueCAN",
 	},
 	{
 	    USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI,
-	    0,
-	    "Intrepid",
 	    "NeoVI Blue",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSSMRW,
-	    0,
-	    "I/O Data",
 	    "USB-SSMRW SD-card",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSDRW,
-	    0,
-	    "I/O Data",
 	    "USB-SDRW SD-card",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
-	    0,
-	    "I/O Data",
 	    "USB ETT",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
-	    0,
-	    "I/O Data",
 	    "USB ETTX",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS,
-	    0,
-	    "I/O Data",
 	    "USB ETTX",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11A,
-	    0,
-	    "I/O Data",
 	    "USB WN-B11",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11,
-	    0,
-	    "I/O Data",
 	    "USB Airport WN-B11",
 	},
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
-	    0,
-	    "I/O Data",
 	    "RSAQ1 Serial",
 	},
 	{
 	    USB_VENDOR_IODATA2, USB_PRODUCT_IODATA2_USB2SC,
-	    0,
-	    "I-O Data",
 	    "USB2.0-SCSI Bridge USB2-SC",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
-	    0,
-	    "Iomega",
 	    "Zip 100",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
-	    0,
-	    "Iomega",
 	    "Zip 250",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250_2,
-	    0,
-	    "Iomega",
 	    "Zip 250",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_CDRW,
-	    0,
-	    "Iomega",
 	    "CDRW 9602",
 	},
 	{
 	    USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX,
-	    0,
-	    "iRiver",
 	    "iFP-1xx",
 	},
 	{
 	    USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX,
-	    0,
-	    "iRiver",
 	    "iFP-3xx",
 	},
 	{
 	    USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_5XX,
-	    0,
-	    "iRiver",
 	    "iFP-5xx",
 	},
 	{
 	    USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA,
-	    0,
-	    "Jaton",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_JENOPTIK, USB_PRODUCT_JENOPTIK_JD350,
-	    0,
-	    "Jenoptik",
 	    "JD 350",
 	},
 	{
 	    USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V,
-	    0,
-	    "Japan Radio Company",
 	    "AirH\"PHONE AH-J3001V/J3002V",
 	},
 	{
 	    USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_XP7250_WL,
-	    0,
-	    "JVC",
 	    "MP-XP7250 Builtin WLAN",
 	},
 	{
 	    USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1,
-	    0,
-	    "JVC",
 	    "MP-PRX1",
 	},
 	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
-	    0,
-	    "Kawasaki LSI",
 	    "10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
-	    0,
-	    "Kawasaki LSI",
 	    "10BT Ethernet",
 	},
 	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
-	    0,
-	    "Kawatsu Semiconductor",
 	    "MiniHub 4000P",
 	},
 	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_KC180,
-	    0,
-	    "Kawatsu Semiconductor",
 	    "KC-180 IrDA",
 	},
 	{
 	    USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ,
-	    0,
-	    "Keisokugiken",
 	    "HKS-0200 USBDAQ",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
-	    0,
-	    "Kensington",
 	    "Orbit trackball",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_TURBOBALL,
-	    0,
-	    "Kensington",
 	    "TurboBall",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT_MAC,
-	    0,
-	    "Kensington",
 	    "Orbit trackball for Mac",
 	},
 	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA,
-	    0,
-	    "Kensington",
 	    "VideoCAM VGA",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28_NF,
-	    0,
-	    "Keyspan",
 	    "USA-28 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X_NF,
-	    0,
-	    "Keyspan",
 	    "USA-28X serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19_NF,
-	    0,
-	    "Keyspan",
 	    "USA-19 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF,
-	    0,
-	    "Keyspan",
 	    "USA-18 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X_NF,
-	    0,
-	    "Keyspan",
 	    "USA-18X serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W_NF,
-	    0,
-	    "Keyspan",
 	    "USA-19W serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
-	    0,
-	    "Keyspan",
 	    "USA-19 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W,
-	    0,
-	    "Keyspan",
 	    "USA-19W serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W_NF,
-	    0,
-	    "Keyspan",
 	    "USA-49W serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
-	    0,
-	    "Keyspan",
 	    "USA-49W serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI_NF,
-	    0,
-	    "Keyspan",
 	    "USA-19QI serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI,
-	    0,
-	    "Keyspan",
 	    "USA-19QI serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q_NF,
-	    0,
-	    "Keyspan",
 	    "USA-19Q serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
-	    0,
-	    "Keyspan",
 	    "USA-19Q serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
-	    0,
-	    "Keyspan",
 	    "USA-28 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB,
-	    0,
-	    "Keyspan",
 	    "USA-28X/XB serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18,
-	    0,
-	    "Keyspan",
 	    "USA-18 serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
-	    0,
-	    "Keyspan",
 	    "USA-18X serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF,
-	    0,
-	    "Keyspan",
 	    "USA-28XB serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA_NF,
-	    0,
-	    "Keyspan",
 	    "USA-28XB serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA,
-	    0,
-	    "Keyspan",
 	    "USA-28XA serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA_NF,
-	    0,
-	    "Keyspan",
 	    "USA-18XA serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA,
-	    0,
-	    "Keyspan",
 	    "USA-18XA serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW_NF,
-	    0,
-	    "Keyspan",
 	    "USA-19WQ serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW,
-	    0,
-	    "Keyspan",
 	    "USA-19WQ serial",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10,
-	    0,
-	    "Keyspan",
 	    "UIA-10 remote control",
 	},
 	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA11,
-	    0,
-	    "Keyspan",
 	    "UIA-11 remote control",
 	},
 	{
 	    USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1,
-	    0,
-	    "Kingston Technology",
 	    "Ethernet",
 	},
 	{
 	    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_KODAK, USB_PRODUCT_KODAK_DX4900,
-	    0,
-	    "Eastman Kodak",
 	    "EasyShare DX4900",
 	},
 	{
 	    USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA,
-	    0,
-	    "Konica",
 	    "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",
 	},
 	{
 	    USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V,
-	    0,
-	    "Kyocera",
 	    "AH-K3001V",
 	},
 	{
 	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD,
-	    0,
-	    "LaCie",
 	    "Hard Disk",
 	},
 	{
 	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW,
-	    0,
-	    "LaCie",
 	    "CD R/W",
 	},
 	{
 	    USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT,
-	    0,
-	    "Lexar Media",
 	    "jumpSHOT CompactFlash",
 	},
 	{
 	    USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_2662WAR,
-	    0,
-	    "Lexar Media",
 	    "2662W-AR",
 	},
 	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
-	    0,
-	    "Lexmark International",
 	    "Optra S 2450",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2,
-	    0,
-	    "Linksys",
 	    "Camedia MAUSB-2",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1,
-	    0,
-	    "Linksys",
 	    "USB10TX",
 	},
 	{
 	    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_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11,
-	    0,
-	    "Linksys",
 	    "WUSB11 802.11b",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11_25,
-	    0,
-	    "Linksys",
 	    "WUSB11 802.11b v2.5",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB12_11,
-	    0,
-	    "Linksys",
 	    "WUSB12 802.11b v1.1",
 	},
 	{
 	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M,
-	    0,
-	    "Linksys",
 	    "USB 2.0 10/100 ethernet controller",
 	},
 	{
 	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
-	    0,
-	    "Linksys",
 	    "WUSB11",
 	},
 	{
 	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_NWU11B,
-	    0,
-	    "Linksys",
 	    "Network Everywhere NWU11B",
 	},
 	{
 	    USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V28,
-	    0,
-	    "Linksys",
 	    "WUSB11 v2.8",
 	},
 	{
 	    USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V30,
-	    0,
-	    "Linksys",
 	    "WUSB11 v3.0",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
-	    0,
-	    "Linksys",
 	    "USB10TX",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
-	    0,
-	    "Logitech",
 	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
-	    0,
-	    "Logitech",
 	    "M4848 mouse",
 	},
 	{
 	    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_QUICKCAMPRO3k,
-	    0,
-	    "Logitech",
 	    "QuickCam Pro 3000",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRONB,
-	    0,
-	    "Logitech",
 	    "QuickCam Notebook Pro",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO4K,
-	    0,
-	    "Logitech",
 	    "QuickCam Pro 4000",
 	},
 	{
 	    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_BD58,
-	    0,
-	    "Logitech",
 	    "BD58 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A,
-	    0,
-	    "Logitech",
 	    "iFeel Mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
-	    0,
-	    "Logitech",
 	    "WingMan GamePad Extreme",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMRPAD,
-	    0,
-	    "Logitech",
 	    "WingMan RumblePad",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
-	    0,
-	    "Logitech",
 	    "WingMan Force joystick",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMFFGP,
-	    0,
-	    "Logitech",
 	    "WingMan Formula Force GP (GT-Force)",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_ITOUCH,
-	    0,
-	    "Logitech",
 	    "iTouch Keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
-	    0,
-	    "Logitech",
 	    "USB-PS/2 Trackball",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB18,
-	    0,
-	    "Logitech",
 	    "TrackMan Wheel",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53,
-	    0,
-	    "Logitech",
 	    "Cordless mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RB6,
-	    0,
-	    "Logitech",
 	    "Cordless keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_CDO,
-	    0,
-	    "Logitech",
 	    "Cordless Desktop Optical",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
-	    0,
-	    "Logitech",
 	    "QuickCam Pro",
 	},
 	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_LCS8138TX,
-	    0,
-	    "AboCom Systems",
 	    "LCS-8138TX",
 	},
 	{
 	    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_DU_H3SP_USB232,
-	    0,
-	    "MCT",
 	    "D-Link DU-H3SP BAY Hub",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,
-	    0,
-	    "MCT",
 	    "RS232 Interface",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_SITECOM_USB232,
-	    0,
-	    "MCT",
 	    "Sitecom RS232",
 	},
 	{
 	    USB_VENDOR_MCT, USB_PRODUCT_MCT_ML_4500,
-	    0,
-	    "MCT",
 	    "ML-4500",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
-	    0,
-	    "Melco",
 	    "LUA-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5,
-	    0,
-	    "Melco",
 	    "LUA-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5,
-	    0,
-	    "Melco",
 	    "LUA2-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAKTX,
-	    0,
-	    "Melco",
 	    "LUA-KTX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_S11,
-	    0,
-	    "Melco",
 	    "WLI-USB-S11",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_MCRSM2,
-	    0,
-	    "Melco",
 	    "MCR-SM2 SmartMedia",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG,
-	    0,
-	    "Melco",
 	    "USB-IDE Bridge: DUB-PxxG",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G,
-	    0,
-	    "Melco",
 	    "WLI-USB-KS11G wlan",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX,
-	    0,
-	    "Melco",
 	    "LUA-U2-KTX Ethernet",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KB11,
-	    0,
-	    "Melco",
 	    "WLI-USB-KB11 WLAN",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB,
-	    0,
-	    "Melco",
 	    "WLI-U2-KG54-YB WLAN",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54,
-	    0,
-	    "Melco",
 	    "WLI-U2-KG54 WLAN",
 	},
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI,
-	    0,
-	    "Melco",
 	    "WLI-U2-KG54-AI WLAN",
 	},
 	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
-	    0,
-	    "Metricom",
 	    "Ricochet GS",
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_WLAN,
-	    0,
-	    "Micro Star International",
 	    "WLAN",
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH,
-	    0,
-	    "Micro Star International",
 	    "Bluetooth",
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570,
-	    0,
-	    "Micro Star International",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2,
-	    0,
-	    "Micro Star International",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3,
-	    0,
-	    "Micro Star International",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
-	    0,
-	    "Micronet Communications",
 	    "SP128AR EtherFast",
 	},
 	{
 	    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",
 	},
 	{
 	    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_TBEXPLORER,
-	    0,
-	    "Microsoft",
 	    "Trackball Explorer",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
-	    0,
-	    "Microsoft",
 	    "IntelliEye mouse",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
-	    0,
-	    "Microsoft",
 	    "Internet Keyboard Pro",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN510,
-	    0,
-	    "Microsoft",
 	    "MN510 Wireless",
 	},
 	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110,
-	    0,
-	    "Microsoft",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,
-	    0,
-	    "Microtech",
 	    "SCSI-DB25",
 	},
 	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50,
-	    0,
-	    "Microtech",
 	    "SCSI-HD50",
 	},
 	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
-	    0,
-	    "Microtech",
 	    "CameraMate",
 	},
 	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM,
-	    0,
-	    "Microtech",
 	    "Freecom IDE",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
-	    0,
-	    "Microtek",
 	    "Phantom 336CX - C3",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U,
-	    0,
-	    "Microtek",
 	    "ScanMaker X6 - X6U",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6,
-	    0,
-	    "Microtek",
 	    "Phantom C6",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2,
-	    0,
-	    "Microtek",
 	    "Phantom 336CX - C3",
 	},
 	{
 	    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_MINDSATWORK, USB_PRODUCT_MINDSATWORK_DW,
-	    0,
-	    "Minds At Work",
 	    "Digital Wallet",
 	},
 	{
 	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304,
-	    0,
-	    "Minolta",
 	    "Dimage S304",
 	},
 	{
 	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X,
-	    0,
-	    "Minolta",
 	    "Dimage X",
 	},
 	{
 	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGE7I,
-	    0,
-	    "Minolta",
 	    "Dimage 7i",
 	},
 	{
 	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1,
-	    0,
-	    "Minolta",
 	    "Dimage A1",
 	},
 	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
-	    0,
-	    "Mitsumi",
 	    "CD-R/RW Drive",
 	},
 	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_MOUSE,
-	    0,
-	    "Mitsumi",
 	    "Mouse",
 	},
 	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD,
-	    0,
-	    "Mitsumi",
 	    "FDD",
 	},
 	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
-	    0,
-	    "Mobility",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EASIDOCK,
-	    0,
-	    "Mobility",
 	    "EasiDock Ethernet",
 	},
 	{
 	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
-	    0,
-	    "Motorola",
 	    "MC141555 hub controller",
 	},
 	{
 	    USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_T720C,
-	    0,
-	    "Motorola",
 	    "T720c",
 	},
 	{
 	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_SB4100,
-	    0,
-	    "Motorola",
 	    "SB4100 Cable Modem",
 	},
 	{
 	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
-	    0,
-	    "MultiTech",
 	    "MT5634ZBA modem",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
-	    0,
-	    "Mustek Systems",
 	    "1200 CU",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU,
-	    0,
-	    "Mustek Systems",
 	    "600 CU",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB,
-	    0,
-	    "Mustek Systems",
 	    "1200",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB,
-	    0,
-	    "Mustek Systems",
 	    "1200 UB",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS,
-	    0,
-	    "Mustek Systems",
 	    "1200 Plus",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS,
-	    0,
-	    "Mustek Systems",
 	    "1200 CU Plus",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F,
-	    0,
-	    "Mustek Systems",
 	    "BearPaw 1200F",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB,
-	    0,
-	    "Mustek Systems",
 	    "600",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
-	    0,
-	    "Mustek Systems",
 	    "MDC-800",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_DV2000,
-	    0,
-	    "Mustek Systems",
 	    "DV2000",
 	},
 	{
 	    USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
-	    0,
-	    "M-Systems",
 	    "DiskOnKey",
 	},
 	{
 	    USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2,
-	    0,
-	    "M-Systems",
 	    "DiskOnKey",
 	},
 	{
 	    USB_VENDOR_NI, USB_PRODUCT_NI_GPIB_USB_A,
-	    0,
-	    "National Instruments",
 	    "GPIB-USB-A",
 	},
 	{
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200,
-	    0,
-	    "National Semiconductor",
 	    "BearPaw 1200",
 	},
 	{
 	    USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400,
-	    0,
-	    "National Semiconductor",
 	    "BearPaw 2400",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_USB2EXTEND,
-	    0,
-	    "NEC",
 	    "Repeater",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
-	    0,
-	    "NEC",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB_B,
-	    0,
-	    "NEC",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY760,
-	    0,
-	    "NEC",
 	    "Picty760",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY900,
-	    0,
-	    "NEC",
 	    "Picty900",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920,
-	    0,
-	    "NEC",
 	    "Picty920",
 	},
 	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800,
-	    0,
-	    "NEC",
 	    "Picty800",
 	},
 	{
 	    USB_VENDOR_NEC2, USB_PRODUCT_NEC2_HUB2_0,
-	    0,
-	    "NEC",
 	    "USB2.0 Hub",
 	},
 	{
 	    USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050,
-	    0,
-	    "Neodio",
 	    "6-in-1 Flash Device Controller",
 	},
 	{
 	    USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
-	    0,
-	    "Neodio",
 	    "Multi-format Flash Controller",
 	},
 	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
-	    0,
-	    "NetChip Technology",
 	    "Turbo-Connect",
 	},
 	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK40,
-	    0,
-	    "NetChip Technology",
 	    "Clik! 40",
 	},
 	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET,
-	    0,
-	    "NetChip Technology",
 	    "EthernetGadget",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
-	    0,
-	    "BayNETGEAR",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X,
-	    0,
-	    "BayNETGEAR",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101,
-	    0,
-	    "BayNETGEAR",
 	    "10/100 Ethernet",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120,
-	    0,
-	    "BayNETGEAR",
 	    "USB 2.0 Fast Ethernet",
 	},
 	{
 	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
-	    0,
-	    "Netgear",
 	    "MA101",
 	},
 	{
 	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B,
-	    0,
-	    "Netgear",
 	    "MA101 Rev B",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
-	    0,
-	    "BayNETGEAR",
 	    "802.11b",
 	},
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111V2,
-	    0,
-	    "BayNETGEAR",
 	    "802.11b V2",
 	},
 	{
 	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
-	    0,
-	    "Nikon",
 	    "E990",
 	},
 	{
 	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E880,
-	    0,
-	    "Nikon",
 	    "E880",
 	},
 	{
 	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E885,
-	    0,
-	    "Nikon",
 	    "E885",
 	},
 	{
 	    USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2,
-	    0,
-	    "NHJ",
 	    "Camera",
 	},
 	{
 	    USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
-	    0,
-	    "Olympus",
 	    "C-1",
 	},
 	{
 	    USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700,
-	    0,
-	    "Olympus",
 	    "C-700 Ultra Zoom",
 	},
 	{
 	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
-	    0,
-	    "SIIG",
 	    "USB TO Ethernet",
 	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
-	    0,
-	    "OmniVision",
 	    "OV511",
 	},
 	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511PLUS,
-	    0,
-	    "OmniVision",
 	    "OV511+",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2,
-	    0,
-	    "OnSpec",
 	    "disk",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB,
-	    0,
-	    "OnSpec",
 	    "MDCFE-B CF",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS,
-	    0,
-	    "OnSpec",
 	    "Memory Stick+CF",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3,
-	    0,
-	    "OnSpec",
 	    "Datafab-based",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4,
-	    0,
-	    "OnSpec",
 	    "Datafab-based",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM,
-	    0,
-	    "OnSpec",
 	    "PNY/Datafab CF+SM",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM,
-	    0,
-	    "OnSpec",
 	    "Simple Tech/Datafab CF+SM",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1,
-	    0,
-	    "OnSpec",
 	    "CF + SM Combo (LC1)",
 	},
 	{
 	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II,
-	    0,
-	    "OnSpec",
 	    "Datafab MD1-II PC-Card",
 	},
 	{
 	    USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2,
-	    0,
-	    "OnSpec",
 	    "8In2",
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01,
-	    0,
-	    "OQO",
 	    "model 01 WiFi interface",
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_BT01,
-	    0,
-	    "OQO",
 	    "model 01 Bluetooth interface",
 	},
 	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01,
-	    0,
-	    "OQO",
 	    "model 01 Ethernet interface",
 	},
 	{
 	    USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
-	    0,
-	    "Ours Technology",
 	    "Solid state disk",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
-	    0,
-	    "Palm Computing",
 	    "USB Serial Adaptor",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M500,
-	    0,
-	    "Palm Computing",
 	    "Palm m500",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M505,
-	    0,
-	    "Palm Computing",
 	    "Palm m505",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M515,
-	    0,
-	    "Palm Computing",
 	    "Palm m515",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_I705,
-	    0,
-	    "Palm Computing",
 	    "Palm i705",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_Z,
-	    0,
-	    "Palm Computing",
 	    "Palm Tungsten Z",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M125,
-	    0,
-	    "Palm Computing",
 	    "Palm m125",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M130,
-	    0,
-	    "Palm Computing",
 	    "Palm m130",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_T,
-	    0,
-	    "Palm Computing",
 	    "Palm Tungsten T",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE_31,
-	    0,
-	    "Palm Computing",
 	    "Palm Zire 31",
 	},
 	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE,
-	    0,
-	    "Palm Computing",
 	    "Palm Zire",
 	},
 	{
 	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120,
-	    0,
-	    "Panasonic (Matsushita)",
 	    "LS-120",
 	},
 	{
 	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE,
-	    0,
-	    "Panasonic (Matsushita)",
 	    "MultiMediaCard",
 	},
 	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER,
-	    0,
-	    "Pen Drive",
 	    "6 in 1",
 	},
 	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE,
-	    0,
-	    "Pen Drive",
 	    "3 in 1",
 	},
 	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK,
-	    0,
-	    "Pen Drive",
 	    "Disk",
 	},
 	{
 	    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_PHEENET, USB_PRODUCT_PHEENET_WL503IA,
-	    0,
-	    "Pheenet",
 	    "WL-503IA",
 	},
 	{
 	    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_PCA645VC,
-	    0,
-	    "Philips",
 	    "PCA645VC",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC,
-	    0,
-	    "Philips",
 	    "PCA646VC",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC675K,
-	    0,
-	    "Philips",
 	    "PCVC675K Vesta",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
-	    0,
-	    "Philips",
 	    "PCVC680K Vesta Pro",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC690K,
-	    0,
-	    "Philips",
 	    "PCVC690K Vesta Pro Scan Camera",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC730K,
-	    0,
-	    "Philips",
 	    "PCVC730K ToUCam Fun",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC740K,
-	    0,
-	    "Philips",
 	    "PCVC740K ToUCam Pro PC",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC750K,
-	    0,
-	    "Philips",
 	    "PCVC750K ToUCam Pro Scan",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
-	    0,
-	    "Philips",
 	    "DSS 150 Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB,
-	    0,
-	    "Philips",
 	    "DIVA mp3 player",
 	},
 	{
 	    USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122,
-	    0,
-	    "Philips Semiconductors",
 	    "hub",
 	},
 	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
-	    0,
-	    "P.I. Engineering",
 	    "PS2 to Mac",
 	},
 	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_XKEYS,
-	    0,
-	    "P.I. Engineering",
 	    "Xkeys Programmable Keyboard",
 	},
 	{
 	    USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600,
-	    0,
-	    "Pilotech",
 	    "CRW-600 6-in-1",
 	},
 	{
 	    USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H,
-	    0,
-	    "Planex Communications",
 	    "GW-US11H WLAN",
 	},
 	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US11S,
-	    0,
-	    "Planex Communications",
 	    "GW-US11S WLAN",
 	},
 	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
-	    0,
-	    "Plantronics",
 	    "Platronics DSP-400 Headset",
 	},
 	{
 	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
-	    0,
-	    "PLX",
 	    "test board",
 	},
 	{
 	    USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8,
-	    0,
-	    "PortGear",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9,
-	    0,
-	    "PortGear",
 	    "Ethernet",
 	},
 	{
 	    USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA,
-	    0,
-	    "Portsmith",
 	    "Express Ethernet",
 	},
 	{
 	    USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
-	    0,
-	    "PQI",
 	    "Travel Flash Drive",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
-	    0,
-	    "Primax Electronics",
 	    "G2-200",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300,
-	    0,
-	    "Primax Electronics",
 	    "G2E-300",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300,
-	    0,
-	    "Primax Electronics",
 	    "G2-300",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002,
-	    0,
-	    "Primax Electronics",
 	    "G2E-300",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 9600",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 600u",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_6200,
-	    0,
-	    "Primax Electronics",
 	    "Visioneer 6200",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 19200",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U,
-	    0,
-	    "Primax Electronics",
 	    "Colorado 1200u",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600,
-	    0,
-	    "Primax Electronics",
 	    "G2-600",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I,
-	    0,
-	    "Primax Electronics",
 	    "ReadyScan 636i",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600,
-	    0,
-	    "Primax Electronics",
 	    "G2-600",
 	},
 	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600,
-	    0,
-	    "Primax Electronics",
 	    "G2E-600",
 	},
 	{
 	    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_RSAQ2,
-	    0,
-	    "Prolific Technology",
 	    "PL2303 Serial",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303,
-	    0,
-	    "Prolific Technology",
 	    "PL2303 Serial",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305,
-	    0,
-	    "Prolific Technology",
 	    "Parallel printer",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4,
-	    0,
-	    "Prolific Technology",
 	    "ATAPI-4 Bridge Controller",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501,
-	    0,
-	    "Prolific Technology",
 	    "PL2501 Host-Host interface",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X,
-	    0,
-	    "Prolific Technology",
 	    "PL2303 Serial",
 	},
 	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X2,
-	    0,
-	    "Prolific Technology",
 	    "PL2303 Serial",
 	},
 	{
 	    USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100,
-	    0,
-	    "Putercom",
 	    "USB-1284 BRIDGE",
 	},
 	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
-	    0,
-	    "Qtronix",
 	    "Scorpion-980N",
 	},
 	{
 	    USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_MODEM,
-	    0,
-	    "Qualcomm",
 	    "CDMA MSM modem",
 	},
 	{
 	    USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_MSM_PHONE,
-	    0,
-	    "Qualcomm",
 	    "CDMA MSM phone",
 	},
 	{
 	    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_RALINK, USB_PRODUCT_RALINK_RT2570,
-	    0,
-	    "Ralink Technology",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2,
-	    0,
-	    "Ralink Technology",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
-	    0,
-	    "Ralink Technology",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
-	    0,
-	    "RATOC Systems",
 	    "USB serial REX-USB60",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150,
-	    0,
-	    "Realtek",
 	    "RTL8150",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8151,
-	    0,
-	    "Realtek",
 	    "RTL8151 PNA",
 	},
 	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
-	    0,
-	    "Realtek",
 	    "RTL8187",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100,
-	    0,
-	    "Roland",
 	    "UA-100 Audio I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM4,
-	    0,
-	    "Roland",
 	    "UM-4 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8850,
-	    0,
-	    "Roland",
 	    "SC-8850 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_U8,
-	    0,
-	    "Roland",
 	    "U-8 Audio I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM2,
-	    0,
-	    "Roland",
 	    "UM-2 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SC8820,
-	    0,
-	    "Roland",
 	    "SC-8820 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PC300,
-	    0,
-	    "Roland",
 	    "PC-300 MIDI Keyboard",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
-	    0,
-	    "Roland",
 	    "UM-1 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SK500,
-	    0,
-	    "Roland",
 	    "SK-500 MIDI Keyboard",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SCD70,
-	    0,
-	    "Roland",
 	    "SC-D70 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
-	    0,
-	    "Roland",
 	    "UM-880 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD90,
-	    0,
-	    "Roland",
 	    "SD-90 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM550,
-	    0,
-	    "Roland",
 	    "UM-550 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD20,
-	    0,
-	    "Roland",
 	    "SD-20 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_SD80,
-	    0,
-	    "Roland",
 	    "SD-80 MIDI Synth",
 	},
 	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA700,
-	    0,
-	    "Roland",
 	    "UA-700 Audio I/F",
 	},
 	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
-	    0,
-	    "Rockfire",
 	    "gamepad 203USB",
 	},
 	{
 	    USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
-	    0,
-	    "Saitek",
 	    "Cyborg 3D Gold Joystick",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-05a",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-31",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-05",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-12",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-09",
 	},
 	{
 	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75,
-	    0,
-	    "SanDisk",
 	    "ImageMate SDDR-75",
 	},
 	{
 	    USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB,
-	    0,
-	    "Sanwa Supply",
 	    "JY-DV9USB gamepad",
 	},
 	{
 	    USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900,
-	    0,
-	    "Sanyo Electric",
 	    "Sanyo SCP-4900 Phone",
 	},
 	{
 	    USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_SWL2100W,
-	    0,
-	    "Samsung",
 	    "SWL-2100U",
 	},
 	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R,
-	    0,
-	    "ScanLogic",
 	    "SL11R-IDE",
 	},
 	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX,
-	    0,
-	    "ScanLogic",
 	    "Phantom 336CX - C3",
 	},
 	{
 	    USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL,
-	    0,
-	    "Sealevel System",
 	    "USB-Serial converter",
 	},
 	{
 	    USB_VENDOR_SERVERWORKS, USB_PRODUCT_SERVERWORKS_HUB,
-	    0,
-	    "ServerWorks",
 	    "Root Hub",
 	},
 	{
 	    USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
-	    0,
-	    "Silicon Graphics",
 	    "SN1 L1 System Controller",
 	},
 	{
 	    USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA,
-	    0,
-	    "Shark",
 	    "Pocket Adapter",
 	},
 	{
 	    USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500,
-	    0,
-	    "Sharp",
 	    "SL5500",
 	},
 	{
 	    USB_VENDOR_SHARP, USB_PRODUCT_SHARP_A300,
-	    0,
-	    "Sharp",
 	    "A300",
 	},
 	{
 	    USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600,
-	    0,
-	    "Sharp",
 	    "SL5600",
 	},
 	{
 	    USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700,
-	    0,
-	    "Sharp",
 	    "C700",
 	},
 	{
 	    USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750,
-	    0,
-	    "Sharp",
 	    "C750",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
-	    0,
-	    "Shuttle Technology",
 	    "E-USB Bridge",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI,
-	    0,
-	    "Shuttle Technology",
 	    "eUSCSI Bridge",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SDDR09,
-	    0,
-	    "Shuttle Technology",
 	    "ImageMate SDDR09",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBSMCF,
-	    0,
-	    "Shuttle Technology",
 	    "eUSB SmartMedia / CompactFlash",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
-	    0,
-	    "Shuttle Technology",
 	    "eUSB MultiMediaCard",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD,
-	    0,
-	    "Shuttle Technology",
 	    "Sony Hifd",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI,
-	    0,
-	    "Shuttle Technology",
 	    "eUSB ATA/ATAPI",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF,
-	    0,
-	    "Shuttle Technology",
 	    "eUSB CompactFlash",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_B,
-	    0,
-	    "Shuttle Technology",
 	    "eUSCSI Bridge",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_C,
-	    0,
-	    "Shuttle Technology",
 	    "eUSCSI Bridge",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CDRW,
-	    0,
-	    "Shuttle Technology",
 	    "CD-RW Device",
 	},
 	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SCM,
-	    0,
-	    "Shuttle Technology",
 	    "SCM Micro",
 	},
 	{
 	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WLL013,
-	    0,
-	    "Siemens",
 	    "WLL013",
 	},
 	{
 	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
-	    0,
-	    "Siemens",
 	    "SpeedStream",
 	},
 	{
 	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM22,
-	    0,
-	    "Siemens",
 	    "SpeedStream 1022",
 	},
 	{
 	    USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
-	    0,
-	    "Sigmatel",
 	    "IrDA",
 	},
 	{
 	    USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X,
-	    0,
-	    "Sigmatel",
 	    "Datum Networks SSF-7X Multi Players",
 	},
 	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
-	    0,
-	    "SIIG",
 	    "DigiFilm-Combo",
 	},
 	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER,
-	    0,
-	    "SIIG",
 	    "MULTICARDREADER",
 	},
 	{
 	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
-	    0,
-	    "SIIG",
 	    "Serial",
 	},
 	{
 	    USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E,
-	    0,
-	    "Silicom",
 	    "U2E",
 	},
 	{
 	    USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE,
-	    0,
-	    "Silicom",
 	    "Psion Dacom Gold Port Ethernet",
 	},
 	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
-	    0,
-	    "Silicon Portals",
 	    "YAP Phone (no firmware)",
 	},
 	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
-	    0,
-	    "Silicon Portals",
 	    "YAP Phone",
 	},
 	{
 	    USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER,
-	    0,
-	    "Sirius Technologies",
 	    "NetComm Roadster II 56",
 	},
 	{
 	    USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029,
-	    0,
-	    "Sitecom",
 	    "LN029",
 	},
 	{
 	    USB_VENDOR_SITECOM2, USB_PRODUCT_SITECOM2_WL022,
-	    0,
-	    "Sitecom",
 	    "WL-022",
 	},
 	{
 	    USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104,
-	    0,
-	    "Sitecom",
 	    "CN104",
 	},
 	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
-	    0,
-	    "SmartBridges",
 	    "SmartLink Ethernet",
 	},
 	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC,
-	    0,
-	    "SmartBridges",
 	    "smartNIC 2 PnP",
 	},
 	{
 	    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_SMC, USB_PRODUCT_SMC_2206USB,
-	    0,
-	    "Standard Microsystems",
 	    "EZ Connect Ethernet",
 	},
 	{
 	    USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB,
-	    0,
-	    "Standard Microsystems",
 	    "Hub",
 	},
 	{
 	    USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV1,
-	    0,
-	    "SMC",
 	    "EZ Connect 11Mbps",
 	},
 	{
 	    USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV2,
-	    0,
-	    "SMC",
 	    "EZ Connect 11Mbps v2",
 	},
 	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
-	    0,
-	    "SOHOware",
 	    "NUB100 Ethernet",
 	},
 	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110,
-	    0,
-	    "SOHOware",
 	    "NUB110 Ethernet",
 	},
 	{
 	    USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD,
-	    0,
-	    "Solid Year",
 	    "Keyboard",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
-	    0,
-	    "Sony",
 	    "Sony DSC Cameras",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_NWMS7,
-	    0,
-	    "Sony",
 	    "Memorystick NW-MS7",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DRIVEV2,
-	    0,
-	    "Sony",
 	    "Harddrive V2",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1,
-	    0,
-	    "Sony",
 	    "Memorystick MSAC-US1",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_HANDYCAM,
-	    0,
-	    "Sony",
 	    "Handycam",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
-	    0,
-	    "Sony",
 	    "Sony MSC Memorystick Slot",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
-	    0,
-	    "Sony",
 	    "Clie v3.5",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARD,
-	    0,
-	    "Sony",
 	    "PlayStation2 keyboard",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARDHUB,
-	    0,
-	    "Sony",
 	    "PlayStation2 keyboard hub",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2MOUSE,
-	    0,
-	    "Sony",
 	    "PlayStation2 mouse",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40,
-	    0,
-	    "Sony",
 	    "Clie v4.0",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS,
-	    0,
-	    "Sony",
 	    "Clie v4.0 Memory Stick slot",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360,
-	    0,
-	    "Sony",
 	    "Sony Clie s360",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41_MS,
-	    0,
-	    "Sony",
 	    "Clie v4.1 Memory Stick slot",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41,
-	    0,
-	    "Sony",
 	    "Clie v4.1",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60,
-	    0,
-	    "Sony",
 	    "Sony Clie nx60",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25,
-	    0,
-	    "Sony",
 	    "Sony Clie tj25",
 	},
 	{
 	    USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8,
-	    0,
-	    "SOURCENEXT",
 	    "KeikaiDenwa 8",
 	},
 	{
 	    USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG,
-	    0,
-	    "SOURCENEXT",
 	    "KeikaiDenwa 8 with charger",
 	},
 	{
 	    USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
-	    0,
-	    "Sphairon Access Systems GmbH",
 	    "UB801R",
 	},
 	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
-	    0,
-	    "STMicroelectronics",
 	    "Communicator",
 	},
 	{
 	    USB_VENDOR_STSN, USB_PRODUCT_STSN_STSN0001,
-	    0,
-	    "STSN",
 	    "Internet Access Device",
 	},
 	{
 	    USB_VENDOR_SUNCOMM, USB_PRODUCT_SUNCOMM_MB_ADAPTOR,
-	    0,
-	    "Sun Communications",
 	    "Mobile Adaptor",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_DS96L,
-	    0,
-	    "SUN Corporation",
 	    "U-Cable type D2",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
-	    0,
-	    "SUN Corporation",
 	    "U-Cable type P1",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
-	    0,
-	    "SUN Corporation",
 	    "Slipper U",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
-	    0,
-	    "SUN Corporation",
 	    "Ir-Trinity",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
-	    0,
-	    "SUN Corporation",
 	    "U-Cable type A3",
 	},
 	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS144L4,
-	    0,
-	    "SUN Corporation",
 	    "U-Cable type A4",
 	},
 	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
-	    0,
-	    "Sun Microsystems",
 	    "Type 6 Keyboard",
 	},
 	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE,
-	    0,
-	    "Sun Microsystems",
 	    "Type 6 Mouse",
 	},
 	{
 	    USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL,
-	    0,
-	    "System Talks",
 	    "SGC-X2UL",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
-	    0,
-	    "Diamond (Supra)",
 	    "Supra Express 56K",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRA2890,
-	    0,
-	    "Diamond (Supra)",
 	    "SupraMax 2890 56K",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB,
-	    0,
-	    "Diamond (Supra)",
 	    "Rio 600",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO800USB,
-	    0,
-	    "Diamond (Supra)",
 	    "Rio 800",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120,
-	    0,
-	    "Diamond (Supra)",
 	    "Nike psa[play 120",
 	},
 	{
 	    USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570,
-	    0,
-	    "Surecom Technology",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
-	    0,
-	    "Acer Communications & Multimedia",
 	    "EP-1427X-2 Ethernet",
 	},
 	{
 	    USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11,
-	    0,
-	    "Susteen",
 	    "Ericsson DCU-10/11",
 	},
 	{
 	    USB_VENDOR_TANGTOP, USB_PRODUCT_TANGTOP_USBPS2,
-	    0,
-	    "Tangtop",
 	    "USBPS2",
 	},
 	{
 	    USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,
-	    0,
-	    "Taugagreining HF",
 	    "CameraMate (DPCM_USB)",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664,
-	    0,
-	    "TDK",
 	    "USB-PDC Adapter UPA9664",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UCA1464,
-	    0,
-	    "TDK",
 	    "USB-cdmaOne Adapter UCA1464",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400,
-	    0,
-	    "TDK",
 	    "USB-PHS Adapter UHA6400",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA6400,
-	    0,
-	    "TDK",
 	    "USB-PHS Adapter UPA6400",
 	},
 	{
 	    USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,
-	    0,
-	    "TEAC",
 	    "FD-05PUB",
 	},
 	{
 	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_0193,
-	    0,
-	    "Tekram Technology",
 	    "ALLNET 0193 WLAN",
 	},
 	{
 	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZYAIR_B200,
-	    0,
-	    "Tekram Technology",
 	    "ZyXEL ZyAIR B200 WLAN",
 	},
 	{
 	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_U300C,
-	    0,
-	    "Tekram Technology",
 	    "U-300C",
 	},
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
-	    0,
-	    "Telex Communications",
 	    "Microphone",
 	},
 	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
-	    0,
-	    "Texas Instruments",
 	    "UT-USB41 hub",
 	},
 	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_TUSB2046,
-	    0,
-	    "Texas Instruments",
 	    "TUSB2046 hub",
 	},
 	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
-	    0,
-	    "Texas Instruments",
 	    "Nex II Digital",
 	},
 	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
-	    0,
-	    "Thrustmaster",
 	    "Fusion Digital Gamepad",
 	},
 	{
 	    USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI,
-	    0,
-	    "Todos Data System",
 	    "Argos Mini Smartcard",
 	},
 	{
 	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
-	    0,
-	    "Trek Technology",
 	    "ThumbDrive",
 	},
 	{
 	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
-	    0,
-	    "Trek Technology",
 	    "ThumbDrive 8MB",
 	},
 	{
 	    USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
-	    0,
-	    "Tripp-Lite",
 	    "U209 Serial",
 	},
 	{
 	    USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
-	    0,
-	    "Trumpion Microelectronics",
 	    "USB/MP3 decoder",
 	},
 	{
 	    USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_XXX1100,
-	    0,
-	    "Trumpion Microelectronics",
 	    "XXX 1100",
 	},
 	{
 	    USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000,
-	    0,
-	    "Tsunami",
 	    "SM-2000",
 	},
 	{
 	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
-	    0,
-	    "Ultima",
 	    "1200 UB Plus",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 1236U",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 1220U",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2000U",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2100U",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 2200U",
 	},
 	{
 	    USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400,
-	    0,
-	    "UMAX Data Systems",
 	    "Astra 3400",
 	},
 	{
 	    USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
-	    0,
-	    "Universal Access",
 	    "Panache Surf ISDN",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_USR1120,
-	    0,
-	    "U.S. Robotics",
 	    "USR1120 WLAN",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_A,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_A_NF,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_A,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_A_NF,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_B,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_B_NF,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_B,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_B_NF,
-	    0,
-	    "U.S. Robotics",
 	    "USR9000 SureConnect ADSL",
 	},
 	{
 	    USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB,
-	    0,
-	    "ViewSonic",
 	    "G773 Monitor Hub",
 	},
 	{
 	    USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_P815HUB,
-	    0,
-	    "ViewSonic",
 	    "P815 Monitor Hub",
 	},
 	{
 	    USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773CTRL,
-	    0,
-	    "ViewSonic",
 	    "G773 Monitor Control",
 	},
 	{
 	    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_3000,
-	    0,
-	    "Visioneer",
 	    "Scanport 3000",
 	},
 	{
 	    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_VIVITAR, USB_PRODUCT_VIVITAR_DSC350,
-	    0,
-	    "Vivitar",
 	    "DSC350",
 	},
 	{
 	    USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570,
-	    0,
-	    "VTech",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G,
-	    0,
-	    "Option",
 	    "Vodafone Mobile Connect 3G",
 	},
 	{
 	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION,
-	    0,
-	    "Option",
 	    "GlobeTrotter 3G FUSION",
 	},
 	{
 	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD,
-	    0,
-	    "Option",
 	    "GlobeTrotter 3G QUAD",
 	},
 	{
 	    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_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
-	    0,
-	    "Xirlink",
 	    "Imaging Device",
 	},
 	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
-	    0,
-	    "Xirlink",
 	    "IBM PC Camera",
 	},
 	{
 	    USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
-	    0,
-	    "Y-E Data",
 	    "Flashbuster-U",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
-	    0,
-	    "YAMAHA",
 	    "UX256 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96,
-	    0,
-	    "YAMAHA",
 	    "UX96 MIDI I/F",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RPU200,
-	    0,
-	    "YAMAHA",
 	    "RP-U200",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I,
-	    0,
-	    "YAMAHA",
 	    "NetVolante RTA54i",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B,
-	    0,
-	    "YAMAHA",
 	    "NetVolante RTW65b",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I,
-	    0,
-	    "YAMAHA",
 	    "NetVolante RTW65i",
 	},
 	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I,
-	    0,
-	    "YAMAHA",
 	    "NetVolante RTA55i",
 	},
 	{
 	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
-	    0,
-	    "Yano",
 	    "U640MO-03",
 	},
 	{
 	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_M4Y750,
-	    0,
-	    "Z-Com",
 	    "M4Y-750",
 	},
 	{
 	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_XI725,
-	    0,
-	    "Z-Com",
 	    "XI-725/726",
 	},
 	{
 	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_XI735,
-	    0,
-	    "Z-Com",
 	    "XI-735",
 	},
 	{
 	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570,
-	    0,
-	    "Zinwell",
 	    "RT2570",
 	},
 	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
-	    0,
-	    "Zoom Telephonics",
 	    "2986L Fax Modem",
 	},
 	{
 	    USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1201,
-	    0,
-	    "ZyDAS Technology",
 	    "ZD1201",
 	},
 	{
 	    USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211,
-	    0,
-	    "ZyDAS Technology",
 	    "ZD1211",
 	},
 	{
 	    USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B,
-	    0,
-	    "ZyDAS Technology",
 	    "ZD1211B",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_OMNI56K,
-	    0,
-	    "ZyXEL Communication",
 	    "Omni 56K Plus",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N,
-	    0,
-	    "ZyXEL Communication",
 	    "Scorpion-980N",
 	},
+	{ 0, 0, NULL }
+};
+
+const 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_MITSUMI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MITSUMI,
 	    "Mitsumi",
-	    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_CREATIVE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CREATIVE,
 	    "Creative Labs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CREATIVE2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CREATIVE2,
 	    "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_SMC2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SMC2,
 	    "Standard Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GRAVIS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GRAVIS,
 	    "Advanced Gravis Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SUN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SUN,
 	    "Sun Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TAUGA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TAUGA,
 	    "Taugagreining HF",
-	    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,
+	    USB_VENDOR_NANAO,
 	    "NANAO",
-	    NULL,
 	},
 	{
-	    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_SANYO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SANYO,
 	    "Sanyo Electric",
-	    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_KYOCERA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KYOCERA,
 	    "Kyocera",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PLANTRONICS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PLANTRONICS,
 	    "Plantronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_STMICRO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_STMICRO,
 	    "STMicroelectronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_YAMAHA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_YAMAHA,
 	    "YAMAHA",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_COMPAQ, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_COMPAQ,
 	    "Compaq",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HITACHI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HITACHI,
 	    "Hitachi",
-	    NULL,
 	},
 	{
-	    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_NIKON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NIKON,
 	    "Nikon",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IBM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IBM,
 	    "IBM",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CYPRESS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CYPRESS,
 	    "Cypress Semiconductor",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EPSON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EPSON,
 	    "Seiko Epson",
-	    NULL,
 	},
 	{
-	    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_TDK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TDK,
 	    "TDK",
-	    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",
-	    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,
+	    USB_VENDOR_DIGI2,
 	    "Digi",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ITTCANON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ITTCANON,
 	    "ITT Canon",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALTEC,
 	    "Altec Lansing",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PANASONIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PANASONIC,
 	    "Panasonic (Matsushita)",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SHARP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SHARP,
 	    "Sharp",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IIYAMA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IIYAMA,
 	    "Iiyama",
-	    NULL,
 	},
 	{
-	    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_JVC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_JVC,
 	    "JVC",
-	    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_VIEWSONIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_VIEWSONIC,
 	    "ViewSonic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_XIRLINK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_XIRLINK,
 	    "Xirlink",
-	    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_SAMSUNG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SAMSUNG,
 	    "Samsung",
-	    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_HAUPPAUGE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HAUPPAUGE,
 	    "Hauppauge Computer Works",
-	    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_ROLAND, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ROLAND,
 	    "Roland",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ROCKFIRE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ROCKFIRE,
 	    "Rockfire",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_RATOC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_RATOC,
 	    "RATOC Systems",
-	    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_QUALCOMM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_QUALCOMM,
 	    "Qualcomm",
-	    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",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ULTIMA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ULTIMA,
 	    "Ultima",
-	    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_SUNTAC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SUNTAC,
 	    "SUN Corporation",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LEXAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LEXAR,
 	    "Lexar Media",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADDTRON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADDTRON,
 	    "Addtron",
-	    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",
-	    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_VIVITAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_VIVITAR,
 	    "Vivitar",
-	    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_SGI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SGI,
 	    "Silicon Graphics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SANWASUPPLY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SANWASUPPLY,
 	    "Sanwa Supply",
-	    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_SIGMATEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIGMATEL,
 	    "Sigmatel",
-	    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_SIEMENS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIEMENS,
 	    "Siemens",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AVANCELOGIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AVANCELOGIC,
 	    "Avance Logic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SIEMENS2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIEMENS2,
 	    "Siemens",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MINOLTA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MINOLTA,
 	    "Minolta",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CHPRODUCTS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CHPRODUCTS,
 	    "CH Products",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HAGIWARA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HAGIWARA,
 	    "Hagiwara Sys-Com",
-	    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_SAITEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SAITEK,
 	    "Saitek",
-	    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",
-	    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_KEYSPAN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KEYSPAN,
 	    "Keyspan",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AASHIMA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AASHIMA,
 	    "Aashima Technology",
-	    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_GUILLEMOT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GUILLEMOT,
 	    "Guillemot",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SMC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SMC,
 	    "Standard Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PUTERCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PUTERCOM,
 	    "Putercom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MCT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MCT,
 	    "MCT",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IMATION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IMATION,
 	    "Imation",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SUSTEEN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SUSTEEN,
 	    "Susteen",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EICON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EICON,
 	    "Eicon Networks",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DIGITALSTREAM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DIGITALSTREAM,
 	    "Digital Stream",
-	    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_SURECOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SURECOM,
 	    "Surecom Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LINKSYS2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LINKSYS2,
 	    "Linksys",
-	    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_JENOPTIK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_JENOPTIK,
 	    "Jenoptik",
-	    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",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ABL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ABL,
 	    "ABL Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SUNCOMM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SUNCOMM,
 	    "Sun Communications",
-	    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_OLYMPUS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_OLYMPUS,
 	    "Olympus",
-	    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_ONSPEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ONSPEC,
 	    "OnSpec",
-	    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_CASIO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CASIO,
 	    "CASIO",
-	    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_STSN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_STSN,
 	    "STSN",
-	    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_SOURCENEXT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SOURCENEXT,
 	    "SOURCENEXT",
-	    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_BBELECTRONICS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BBELECTRONICS,
 	    "B&B Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PORTGEAR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PORTGEAR,
 	    "PortGear",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NETGEAR2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NETGEAR2,
 	    "Netgear",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SYSTEMTALKS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SYSTEMTALKS,
 	    "System Talks",
-	    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_JATON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_JATON,
 	    "Jaton",
-	    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",
-	    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_MSYSTEMS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MSYSTEMS,
 	    "M-Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AUTHENTEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AUTHENTEC,
 	    "AuthenTec",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AUDIOTECHNICA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AUDIOTECHNICA,
 	    "Audio-Technica",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TRUMPION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TRUMPION,
 	    "Trumpion Microelectronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ALATION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ALATION,
 	    "Alation Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CONCORDCAMERA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CONCORDCAMERA,
 	    "Concord Camera",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GARMIN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GARMIN,
 	    "Garmin International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GOHUBS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GOHUBS,
 	    "GoHubs",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BIOMETRIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BIOMETRIC,
 	    "American Biometric Company",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INTREPIDCS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INTREPIDCS,
 	    "Intrepid",
-	    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_GUDE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GUDE,
 	    "Gude ADS",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PORTSMITH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PORTSMITH,
 	    "Portsmith",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACERW, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACERW,
 	    "Acer",
-	    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_MINDSATWORK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MINDSATWORK,
 	    "Minds At Work",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INTERSIL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INTERSIL,
 	    "Intersil",
-	    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_CSR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CSR,
 	    "Cambridge Silicon Radio",
-	    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_GREENHOUSE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GREENHOUSE,
 	    "GREENHOUSE",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GEOCAST, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GEOCAST,
 	    "Geocast Network Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ZYDAS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ZYDAS,
 	    "ZyDAS Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NEODIO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NEODIO,
 	    "Neodio",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_OPTION, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_OPTION,
 	    "Option",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TODOS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TODOS,
 	    "Todos Data System",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASUS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASUS,
 	    "ASUS",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SIIG2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SIIG2,
 	    "SIIG",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TEKRAM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TEKRAM,
 	    "Tekram Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HAL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HAL,
 	    "HAL Corporation",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NEC2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NEC2,
 	    "NEC",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ATI2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ATI2,
 	    "ATI",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_KURUSUGAWA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_KURUSUGAWA,
 	    "Kurusugawa Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASIX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASIX,
 	    "ASIX Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_USR, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_USR,
 	    "U.S. Robotics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AMBIT, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AMBIT,
 	    "Ambit Microsystems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_REALTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_REALTEK,
 	    "Realtek",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ADDONICS2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ADDONICS2,
 	    "Addonics Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AGATE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AGATE,
 	    "Agate Technologies",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DMI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DMI,
 	    "DMI",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SEALEVEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SEALEVEL,
 	    "Sealevel System",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_EASYDISK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_EASYDISK,
 	    "EasyDisk",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ZCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ZCOM,
 	    "Z-Com",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TANGTOP, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TANGTOP,
 	    "Tangtop",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SMC3, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SMC3,
 	    "SMC",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PEN, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PEN,
 	    "Pen Drive",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ABC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ABC,
 	    "ABC",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CONCEPTRONIC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CONCEPTRONIC,
 	    "Conceptronic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MSI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MSI,
 	    "Micro Star International",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ELCON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ELCON,
 	    "ELCON Systemtechnik",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HAWKING, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HAWKING,
 	    "Hawking",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GMATE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GMATE,
 	    "G.Mate",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_OTI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_OTI,
 	    "Ours Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PILOTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PILOTECH,
 	    "Pilotech",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AIRPRIME, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AIRPRIME,
 	    "Airprime",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_VTECH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_VTECH,
 	    "VTech",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_FALCOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_FALCOM,
 	    "Falcom Wireless Communications GmbH",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_QUALCOMM2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_QUALCOMM2,
 	    "Qualcomm",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_GIGABYTE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GIGABYTE,
 	    "GIGABYTE",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MOTOROLA, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MOTOROLA,
 	    "Motorola",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CCYU, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CCYU,
 	    "CCYU Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PLX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PLX,
 	    "PLX",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASANTE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASANTE,
 	    "Asante",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ANALOG, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ANALOG,
 	    "Analog Devices",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_JRC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_JRC,
 	    "Japan Radio Company",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SPHAIRON, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SPHAIRON,
 	    "Sphairon Access Systems GmbH",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SERVERWORKS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SERVERWORKS,
 	    "ServerWorks",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ACERCM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ACERCM,
 	    "Acer Communications & Multimedia",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TSUNAMI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TSUNAMI,
 	    "Tsunami",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PHEENET, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PHEENET,
 	    "Pheenet",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_BELKIN2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_BELKIN2,
 	    "Belkin Components",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ARANEUS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ARANEUS,
 	    "Araneus Information Systems",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AINCOMM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AINCOMM,
 	    "Aincomm",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MOBILITY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MOBILITY,
 	    "Mobility",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DICKSMITH, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DICKSMITH,
 	    "Dick Smith Electronics",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CISCOLINKSYS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CISCOLINKSYS,
 	    "Cisco-Linksys",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SHARK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SHARK,
 	    "Shark",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SILICOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SILICOM,
 	    "Silicom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_RALINK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_RALINK,
 	    "Ralink Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_CONCEPTRONIC2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_CONCEPTRONIC2,
 	    "Conceptronic",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SILICONPORTALS, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SILICONPORTALS,
 	    "Silicon Portals",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_OQO, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_OQO,
 	    "OQO",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SOHOWARE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SOHOWARE,
 	    "SOHOware",
-	    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_GOODWAY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GOODWAY,
 	    "Good Way Technology",
-	    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_GIGASET, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_GIGASET,
 	    "Gigaset",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_LINKSYS3, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_LINKSYS3,
 	    "Linksys",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DLINK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DLINK,
 	    "D-Link",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PLANEX2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PLANEX2,
 	    "Planex Communications",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MOTOROLA2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MOTOROLA2,
 	    "Motorola",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_TRIPPLITE, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_TRIPPLITE,
 	    "Tripp-Lite",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NHJ, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NHJ,
 	    "NHJ",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ASUSTEK, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ASUSTEK,
 	    "ASUSTeK Computer",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PLANEX, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PLANEX,
 	    "Planex Communications",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AEI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AEI,
 	    "AEI",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_PQI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_PQI,
 	    "PQI",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DAISY, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DAISY,
 	    "Daisy Technology",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_NI, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_NI,
 	    "National Instruments",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_MICRONET, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_MICRONET,
 	    "Micronet Communications",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IODATA2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IODATA2,
 	    "I-O Data",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_IRIVER, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_IRIVER,
 	    "iRiver",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_DELL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_DELL,
 	    "Dell",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_AVERATEC, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_AVERATEC,
 	    "Averatec",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ONSPEC2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ONSPEC2,
 	    "OnSpec",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_ZINWELL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_ZINWELL,
 	    "Zinwell",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SITECOM, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SITECOM,
 	    "Sitecom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_INTEL, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_INTEL,
 	    "Intel",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_SITECOM2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_SITECOM2,
 	    "Sitecom",
-	    NULL,
 	},
 	{
-	    USB_VENDOR_HP2, 0,
-	    USB_KNOWNDEV_NOPROD,
+	    USB_VENDOR_HP2,
 	    "Hewlett Packard",
-	    NULL,
 	},
-	{ 0, 0, 0, NULL, NULL, }
+	{ 0, NULL }
 };