sync

2 files changed, 178 insertions, 28 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index a83149bfabf..b9723e438a5 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.59 2002/09/27 18:42:35 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.60 2002/11/10 18:55:48 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.56 2002/09/27 18:41:57 nate Exp 
+ *	OpenBSD: usbdevs,v 1.57 2002/11/10 18:55:14 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
+/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak */
 #define	USB_VENDOR_MELCO	0x0411		/* Melco */
-#define	USB_VENDOR_CREATIVELABS	0x041e		/* Creative Labs */
+#define	USB_VENDOR_CREATIVE	0x041e		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology */
 #define	USB_VENDOR_SMC2	0x0424		/* Standard Microsystems */
@@ -303,6 +303,7 @@
 #define	USB_VENDOR_TRUMPION	0x090a		/* Trumpion Microelectronics */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems */
 #define	USB_VENDOR_CONCORDCAMERA	0x0919		/* Concord Camera */
+#define	USB_VENDOR_GOHUBS	0x0921		/* GoHubs */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
 #define	USB_VENDOR_YANO	0x094f		/* Yano */
 #define	USB_VENDOR_KINGSTON	0x0951		/* Kingston Technology */
@@ -330,6 +331,7 @@
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom */
 #define	USB_VENDOR_GREENHOUSE	0x0a6b		/* GREENHOUSE */
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
+#define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
@@ -355,6 +357,7 @@
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
+#define	USB_VENDOR_PQI	0x3538		/* PQI */
 #define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
@@ -465,6 +468,9 @@
 #define	USB_PRODUCT_APPLE_OPTMOUSE	0x0302		/* Optical mouse */
 #define	USB_PRODUCT_APPLE_SPEAKERS	0x1101		/* Speakers */
 
+/* Asahi Optical products */
+#define	USB_PRODUCT_ASAHIOPTICAL_OPTIO230	0x0004		/* PENTAX Optio230 */
+
 /* Asante products */
 #define	USB_PRODUCT_ASANTE_EA	0x1427		/* Ethernet */
 
@@ -500,6 +506,10 @@
 #define	USB_PRODUCT_BILLIONTON_USBEL100	0x0988		/* USB100EL */
 #define	USB_PRODUCT_BILLIONTON_USBE100	0x8511		/* USBE100 */
 
+/* Broadcom products */
+#define	USB_PRODUCT_BROADCOM_BCM2033	0x2000		/* BCM2033 */
+#define	USB_PRODUCT_BROADCOM_BCM2033NF	0x2033		/* BCM2033 (no fw) */
+
 /* Brother Industries products */
 #define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
 
@@ -509,7 +519,11 @@
 /* Canon, Inc. products */
 #define	USB_PRODUCT_CANON_N656U	0x2206		/* CANOSCAN N656U */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
-#define	USB_PRODUCT_CANON_S100	0x3045		/* PowerShot S100 */
+#define	USB_PRODUCT_CANON_S20	0x3043		/* PowerShot S20 */
+#define	USB_PRODUCT_CANON_S100_US	0x3045		/* PowerShot S100 */
+#define	USB_PRODUCT_CANON_S100_EU	0x3047		/* PowerShot S100 */
+#define	USB_PRODUCT_CANON_G1	0x3048		/* PowerShot G1 */
+#define	USB_PRODUCT_CANON_A20	0x304e		/* PowerShot A20 */
 
 /* CATC products */
 #define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate Ethernet */
@@ -559,8 +573,8 @@
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXS	0x000d		/* FEther USB-TXS */
 
 /* Creative Labs products */
-#define	USB_PRODUCT_CREATIVELABS_NOMAD_II	0x1002		/* Nomad II */
-#define	USB_PRODUCT_CREATIVELABS_NOMAD_IIMG	0x4004		/* Nomad II MG */
+#define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II */
+#define	USB_PRODUCT_CREATIVE_NOMAD_IIMG	0x4004		/* Nomad II MG */
 
 /* CTX products */
 #define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
@@ -568,6 +582,7 @@
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
+#define	USB_PRODUCT_CYPRESS_KBDHUB	0x0101		/* Keyboard/Hub */
 #define	USB_PRODUCT_CYPRESS_FMRADIO	0x1002		/* FM Radio */
 
 /* Daisy Technology products */
@@ -591,13 +606,13 @@
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
 #define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 Ethernet */
-#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX3	0x400b		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 ethernet */
-#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 Ethernet */
+#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 ethernet */
 
 /* DMI products */
 #define	USB_PRODUCT_DMI_SA2_0	0xb001		/* Storage Adapter */
@@ -671,8 +686,12 @@
 
 /* Genesys Logic products */
 #define	USB_PRODUCT_GENESYS_GENELINK	0x05e3		/* GeneLink Host-Host Bridge */
+#define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 Hub */
 #define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash */
 
+/* GoHubs products */
+#define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
+
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
@@ -767,6 +786,7 @@
 /* In-System products */
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel adapter */
 #define	USB_PRODUCT_INSYSTEM_ATAPI	0x0031		/* ATAPI adapter */
+#define	USB_PRODUCT_INSYSTEM_IDEUSB2	0x0060		/* USB2 Storage Adapter */
 #define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter ISD110 */
 #define	USB_PRODUCT_INSYSTEM_ISD105	0x0202		/* IDE adapter ISD105 */
 #define	USB_PRODUCT_INSYSTEM_DRIVEV2	0x0301		/* Portable USB Harddrive V2 */
@@ -888,13 +908,14 @@
 #define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
 
 /* Logitech products */
-#define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 */
-#define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 */
+#define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
+#define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 mouse */
 #define	USB_PRODUCT_LOGITECH_PAGESCAN	0x040f		/* PageScan */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMWEB	0x0801		/* QuickCam Web */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO	0x0810		/* QuickCam Pro */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMEXP	0x0840		/* QuickCam Express */
 #define	USB_PRODUCT_LOGITECH_QUICKCAM	0x0850		/* QuickCam */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMPRO3k	0x08b0		/* QuickCam Pro 3000 */
 #define	USB_PRODUCT_LOGITECH_N43	0xc000		/* N43 */
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
@@ -930,6 +951,7 @@
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUA2TX5	0x0009		/* LUA2-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUAKTX	0x0012		/* LUA-KTX Ethernet */
+#define	USB_PRODUCT_MELCO_KS11G	0x0027		/* WLI-USB-KS11G USB-wlan */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -981,7 +1003,7 @@
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
 
 /* MultiTech products */
-#define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA */
+#define	USB_PRODUCT_MULTITECH_ATLAS	0xf101		/* MT5634ZBA modem */
 
 /* Mustek products */
 #define	USB_PRODUCT_MUSTEK_1200CU	0x0001		/* 1200 CU scanner */
@@ -1008,6 +1030,9 @@
 /* NEC2 products */
 #define	USB_PRODUCT_NEC2_HUB2_0	0x0058		/* USB2.0 Hub */
 
+/* NEODIO products */
+#define	USB_PRODUCT_NEODIO_ND5010	0x5010		/* Multi-format Flash Controller */
+
 /* NetChip Technology Products */
 #define	USB_PRODUCT_NETCHIP_TURBOCONNECT	0x1080		/* Turbo-Connect */
 #define	USB_PRODUCT_NETCHIP_CLIK40	0xa140		/* Clik! 40 */
@@ -1044,6 +1069,7 @@
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
 #define	USB_PRODUCT_PALM_M500	0x0001		/* Palm m500 */
 #define	USB_PRODUCT_PALM_M505	0x0002		/* Palm m505 */
+#define	USB_PRODUCT_PALM_M515	0x0003		/* Palm m515 */
 #define	USB_PRODUCT_PALM_M125	0x0040		/* Palm m125 */
 
 /* Panasonic products */
@@ -1091,6 +1117,9 @@
 /* Portsmith products */
 #define	USB_PRODUCT_PORTSMITH_EEA	0x3003		/* Express Ethernet */
 
+/* PQI products */
+#define	USB_PRODUCT_PQI_TRAVELFLASH	0x0001		/* Travel Flash Drive */
+
 /* Primax products */
 #define	USB_PRODUCT_PRIMAX_G2X300	0x0300		/* G2-200 scanner */
 #define	USB_PRODUCT_PRIMAX_G2E300	0x0301		/* G2E-300 scanner */
@@ -1315,6 +1344,7 @@
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
 
 /* Xirlink products */
+#define	USB_PRODUCT_XIRLINK_IMAGING	0x800d		/* Imaging Device */
 #define	USB_PRODUCT_XIRLINK_PCCAM	0x8080		/* IBM PC Camera */
 
 /* Y-E Data products */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7109ea2f0f0..6237561abbf 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.59 2002/09/27 18:42:35 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.60 2002/11/10 18:55:48 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.56 2002/09/27 18:41:57 nate Exp 
+ *	OpenBSD: usbdevs,v 1.57 2002/11/10 18:55:14 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
+/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -419,6 +419,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Speakers",
 	},
 	{
+	    USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230,
+	    0,
+	    "Asahi Optical",
+	    "PENTAX Optio230",
+	},
+	{
 	    USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA,
 	    0,
 	    "Asante",
@@ -527,6 +533,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USBE100",
 	},
 	{
+	    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",
@@ -551,12 +569,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "PowerShot S10",
 	},
 	{
-	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100,
+	    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",
@@ -707,13 +749,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FEther USB-TXS",
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_II,
+	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
 	    0,
 	    "Creative Labs",
 	    "Nomad II",
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_IIMG,
+	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_IIMG,
 	    0,
 	    "Creative Labs",
 	    "Nomad II MG",
@@ -737,6 +779,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "thermometer",
 	},
 	{
+	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_KBDHUB,
+	    0,
+	    "Cypress Semiconductor",
+	    "Keyboard/Hub",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
 	    0,
 	    "Cypress Semiconductor",
@@ -800,7 +848,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
 	    "D-Link",
-	    "10Mbps Ethernet",
+	    "10Mbps ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1,
@@ -812,13 +860,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
 	    0,
 	    "D-Link",
-	    "10/100 Ethernet",
+	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
 	    0,
 	    "D-Link",
-	    "1/10/100 Ethernet",
+	    "1/10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3,
@@ -836,7 +884,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
 	    0,
 	    "D-Link",
-	    "10/100 Ethernet",
+	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
@@ -1109,12 +1157,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "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_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
+	    0,
+	    "GoHubs",
+	    "GoCOM232 Serial converter",
+	},
+	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    0,
 	    "Advanced Gravis Computer",
@@ -1517,6 +1577,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ATAPI adapter",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2,
+	    0,
+	    "In-System Design",
+	    "USB2 Storage Adapter",
+	},
+	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
 	    0,
 	    "In-System Design",
@@ -2006,13 +2072,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
 	    "Logitech",
-	    "M2452",
+	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
 	    0,
 	    "Logitech",
-	    "M4848",
+	    "M4848 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_PAGESCAN,
@@ -2045,6 +2111,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "QuickCam",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO3k,
+	    0,
+	    "Logitech",
+	    "QuickCam Pro 3000",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
 	    0,
 	    "Logitech",
@@ -2207,6 +2279,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LUA-KTX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G,
+	    0,
+	    "Melco",
+	    "WLI-USB-KS11G USB-wlan",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -2384,7 +2462,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
 	    0,
 	    "MultiTech",
-	    "MT5634ZBA",
+	    "MT5634ZBA modem",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
@@ -2477,6 +2555,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB2.0 Hub",
 	},
 	{
+	    USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
+	    0,
+	    "Neodio",
+	    "Multi-format Flash Controller",
+	},
+	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
 	    0,
 	    "NetChip Technology",
@@ -2615,6 +2699,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Palm m505",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M515,
+	    0,
+	    "Palm Computing",
+	    "Palm m515",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M125,
 	    0,
 	    "Palm Computing",
@@ -2783,6 +2873,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Express Ethernet",
 	},
 	{
+	    USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
+	    0,
+	    "PQI",
+	    "Travel Flash Drive",
+	},
+	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
 	    0,
 	    "Primax Electronics",
@@ -3551,6 +3647,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
+	    0,
+	    "Xirlink",
+	    "Imaging Device",
+	},
+	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
 	    0,
 	    "Xirlink",
@@ -3671,7 +3773,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, 0,
+	    USB_VENDOR_CREATIVE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Creative Labs",
 	    NULL,
@@ -5039,6 +5141,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GOHUBS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GoHubs",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BIOMETRIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "American Biometric Company",
@@ -5201,6 +5309,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NEODIO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Neodio",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_TODOS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Todos Data System",
@@ -5351,6 +5465,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PQI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "PQI",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_DAISY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Daisy Technology",