Regenerate usbdevs.h and usbdevs_data.h and fix affected drivers to use new
authorHasso Tepper <hasso@dragonflybsd.org>
Fri, 27 Jul 2007 18:07:21 +0000 (18:07 +0000)
committerHasso Tepper <hasso@dragonflybsd.org>
Fri, 27 Jul 2007 18:07:21 +0000 (18:07 +0000)
data.

sys/bus/usb/usbdevs.h
sys/bus/usb/usbdevs_data.h
sys/dev/netif/rum/if_rum.c
sys/dev/netif/ural/if_ural.c
sys/dev/usbmisc/uplcom/uplcom.c

index e5b47b5..b9de477 100644 (file)
@@ -1,10 +1,10 @@
-/*     $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.17 2007/02/10 05:44:19 sephe Exp $      */
+/*     $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.18 2007/07/27 18:07:21 hasso Exp $      */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     DragonFly: src/sys/bus/usb/usbdevs,v 1.20 2006/12/24 05:16:43 sephe Exp 
+ *     DragonFly: src/sys/bus/usb/usbdevs,v 1.23 2007/07/27 17:49:29 hasso Exp 
  */
 /* $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ */
 /* $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */
  * make the device recognised by the appropriate device driver.
  */
 
+#define        USB_VENDOR_UNKNOWN1     0x0053          /* Unknown vendor */
+#define        USB_VENDOR_UNKNOWN2     0x0105          /* Unknown vendor */
 #define        USB_VENDOR_EGALAX2      0x0123          /* eGalax, Inc. */
+#define        USB_VENDOR_HUMAX        0x02ad          /* HUMAX */
 #define        USB_VENDOR_LTS  0x0386          /* LTS */
+#define        USB_VENDOR_BWCT 0x03da          /* Bernd Walter Computer Technology */
 #define        USB_VENDOR_AOX  0x03e8          /* AOX */
 #define        USB_VENDOR_THESYS       0x03e9          /* Thesys Microelectronics */
 #define        USB_VENDOR_DATABROADCAST        0x03ea          /* Data Broadcasting Corp. */
 #define        USB_VENDOR_VIA  0x040d          /* VIA Technologies */
 #define        USB_VENDOR_MCCI 0x040e          /* MCCI */
 #define        USB_VENDOR_MELCO        0x0411          /* Melco */
+#define        USB_VENDOR_LEADTEK      0x0413          /* Leadtek */
 #define        USB_VENDOR_WINBOND      0x0416          /* Winbond Electronics */
 #define        USB_VENDOR_PHOENIX      0x041a          /* Phoenix Technologies Ltd. */
 #define        USB_VENDOR_CREATIVE     0x041e          /* Creative Labs */
 #define        USB_VENDOR_CIRRUSLOGIC  0x0429          /* Cirrus Logic */
 #define        USB_VENDOR_INNOVATIVE   0x042c          /* Innovative Semiconductors */
 #define        USB_VENDOR_MOLEX        0x042f          /* Molex */
-#define        USB_VENDOR_SUN2 0x0430          /* Sun Microsystems (unofficial) */
+#define        USB_VENDOR_SUN  0x0430          /* Sun Microsystems */
 #define        USB_VENDOR_UNISYS       0x0432          /* Unisys */
 #define        USB_VENDOR_TAUGA        0x0436          /* Taugagreining HF */
 #define        USB_VENDOR_AMD  0x0438          /* Advanced Micro Devices */
 #define        USB_VENDOR_LOGITECH     0x046d          /* Logitech */
 #define        USB_VENDOR_BTC  0x046e          /* Behavior Tech. Computer */
 #define        USB_VENDOR_PHILIPS      0x0471          /* Philips */
-#define        USB_VENDOR_SUN  0x0472          /* Sun Microsystems (offical) */
+#define        USB_VENDOR_SUN2 0x0472          /* Sun Microsystems (official) */
 #define        USB_VENDOR_SANYO        0x0474          /* Sanyo Electric */
 #define        USB_VENDOR_SEAGATE      0x0477          /* Seagate Technology */
 #define        USB_VENDOR_CONNECTIX    0x0478          /* Connectix */
 #define        USB_VENDOR_KENSINGTON   0x047d          /* Kensington */
 #define        USB_VENDOR_LUCENT       0x047e          /* Lucent */
 #define        USB_VENDOR_PLANTRONICS  0x047f          /* Plantronics */
-#define        USB_VENDOR_KYOCERA      0x0482          /* Kyocera */
+#define        USB_VENDOR_KYOCERA      0x0482          /* Kyocera Wireless Corp. */
 #define        USB_VENDOR_STMICRO      0x0483          /* STMicroelectronics */
 #define        USB_VENDOR_FOXCONN      0x0489          /* Foxconn / Hon Hai */
 #define        USB_VENDOR_YAMAHA       0x0499          /* YAMAHA */
 #define        USB_VENDOR_COMPAQ       0x049f          /* Compaq */
 #define        USB_VENDOR_HITACHI      0x04a4          /* Hitachi */
 #define        USB_VENDOR_ACERP        0x04a5          /* Acer Peripherals */
+#define        USB_VENDOR_DAVICOM      0x04a6          /* Davicom */
 #define        USB_VENDOR_VISIONEER    0x04a7          /* Visioneer */
 #define        USB_VENDOR_CANON        0x04a9          /* Canon */
 #define        USB_VENDOR_NIKON        0x04b0          /* Nikon */
 #define        USB_VENDOR_ALTEC        0x04d2          /* Altec Lansing */
 #define        USB_VENDOR_LSI  0x04d4          /* LSI Logic */
 #define        USB_VENDOR_MENTORGRAPHICS       0x04d6          /* Mentor Graphics */
-#define        USB_VENDOR_HOLTEK       0x04d9          /* Holtek Semiconductor */
+#define        USB_VENDOR_ITUNERNET    0x04d8          /* I-Tuner Networks */
+#define        USB_VENDOR_HOLTEK       0x04d9          /* Holtek Semiconductor, Inc. */
 #define        USB_VENDOR_PANASONIC    0x04da          /* Panasonic (Matsushita) */
 #define        USB_VENDOR_HUANHSIN     0x04dc          /* Huan Hsin Holdings Ltd. */
 #define        USB_VENDOR_SHARP        0x04dd          /* Sharp */
 #define        USB_VENDOR_FUJIKURA     0x0501          /* Fujikura/DDK */
 #define        USB_VENDOR_ACER 0x0502          /* Acer */
 #define        USB_VENDOR_3COM 0x0506          /* 3Com */
-#define        USB_VENDOR_HOSIDEN      0x0507          /* Hosiden */
+#define        USB_VENDOR_HOSIDEN      0x0507          /* Hosiden Corporation */
 #define        USB_VENDOR_AZTECH       0x0509          /* Aztech Systems */
 #define        USB_VENDOR_BELKIN       0x050d          /* Belkin Components */
 #define        USB_VENDOR_KAWATSU      0x050f          /* Kawatsu Semiconductor */
 #define        USB_VENDOR_VISION       0x0553          /* VLSI Vision */
 #define        USB_VENDOR_ASAHIKASEI   0x0556          /* Asahi Kasei Microsystems */
 #define        USB_VENDOR_ATEN 0x0557          /* ATEN International */
+#define        USB_VENDOR_SAMSUNG2     0x055d          /* Samsung Electronics */
 #define        USB_VENDOR_MUSTEK       0x055f          /* Mustek Systems */
 #define        USB_VENDOR_TELEX        0x0562          /* Telex Communications */
 #define        USB_VENDOR_CHINON       0x0564          /* Chinon Industries */
 #define        USB_VENDOR_MICREL       0x058d          /* Micrel Semiconductor */
 #define        USB_VENDOR_ALCOR        0x058f          /* Alcor Micro */
 #define        USB_VENDOR_OMRON        0x0590          /* OMRON */
+#define        USB_VENDOR_ZORAN        0x0595          /* Zoran Microelectronics */
 #define        USB_VENDOR_NIIGATA      0x0598          /* Niigata Canotec */
 #define        USB_VENDOR_IOMEGA       0x059b          /* Iomega */
 #define        USB_VENDOR_ATREND       0x059c          /* A-Trend Technology */
 #define        USB_VENDOR_ACTLABS      0x061c          /* Act Labs */
 #define        USB_VENDOR_ALARIS       0x0620          /* Alaris */
 #define        USB_VENDOR_APEX 0x0624          /* Apex */
+#define        USB_VENDOR_CREATIVE3    0x062a          /* Creative Labs */
 #define        USB_VENDOR_VIVITAR      0x0636          /* Vivitar */
+#define        USB_VENDOR_GUNZE        0x0637          /* Gunze Electronics USA */
 #define        USB_VENDOR_AVISION      0x0638          /* Avision */
 #define        USB_VENDOR_TEAC 0x0644          /* TEAC */
 #define        USB_VENDOR_SGI  0x065e          /* Silicon Graphics */
 #define        USB_VENDOR_LINKSYS      0x066b          /* Linksys */
 #define        USB_VENDOR_ACERSA       0x066e          /* Acer Semiconductor America */
 #define        USB_VENDOR_SIGMATEL     0x066f          /* Sigmatel */
+#define        USB_VENDOR_DRAYTEK      0x0675          /* DrayTek */
 #define        USB_VENDOR_AIWA 0x0677          /* Aiwa */
 #define        USB_VENDOR_ACARD        0x0678          /* ACARD Technology */
 #define        USB_VENDOR_PROLIFIC     0x067b          /* Prolific Technology */
 #define        USB_VENDOR_SIEMENS      0x067c          /* Siemens */
 #define        USB_VENDOR_AVANCELOGIC  0x0680          /* Avance Logic */
-#define        USB_VENDOR_HAGIWARA     0x0693          /* Hagiwara Sys-Com */
+#define        USB_VENDOR_SIEMENS2     0x0681          /* Siemens */
 #define        USB_VENDOR_MINOLTA      0x0686          /* Minolta */
 #define        USB_VENDOR_CHPRODUCTS   0x068e          /* CH Products */
+#define        USB_VENDOR_HAGIWARA     0x0693          /* Hagiwara Sys-Com */
 #define        USB_VENDOR_CTX  0x0698          /* Chuntex */
 #define        USB_VENDOR_ASKEY        0x069a          /* Askey Computer */
 #define        USB_VENDOR_SAITEK       0x06a3          /* Saitek */
 #define        USB_VENDOR_AGFA 0x06bd          /* AGFA-Gevaert */
 #define        USB_VENDOR_ASIAMD       0x06be          /* Asia Microelectronic Development */
 #define        USB_VENDOR_BIZLINK      0x06c4          /* Bizlink International */
-#define        USB_VENDOR_KEYSPAN      0x06cd          /* Keyspan */
+#define        USB_VENDOR_KEYSPAN      0x06cd          /* Keyspan / InnoSys Inc. */
 #define        USB_VENDOR_AASHIMA      0x06d6          /* Aashima Technology */
 #define        USB_VENDOR_MULTITECH    0x06e0          /* MultiTech */
 #define        USB_VENDOR_ADS  0x06e1          /* ADS Technologies */
 #define        USB_VENDOR_PUTERCOM     0x0708          /* Putercom */
 #define        USB_VENDOR_MCT  0x0711          /* MCT */
 #define        USB_VENDOR_IMATION      0x0718          /* Imation */
-#define        USB_VENDOR_SUSTEEN      0x0731          /* Susteen */
 #define        USB_VENDOR_SONYERICSSON 0x0731          /* Sony Ericsson */
 #define        USB_VENDOR_EICON        0x0734          /* Eicon Networks */
+#define        USB_VENDOR_SYNTECH      0x0745          /* Syntech Information */
 #define        USB_VENDOR_DIGITALSTREAM        0x074e          /* Digital Stream */
 #define        USB_VENDOR_AUREAL       0x0755          /* Aureal Semiconductor */
 #define        USB_VENDOR_MIDIMAN      0x0763          /* Midiman */
 #define        USB_VENDOR_BRIMAX       0x078e          /* Brimax */
 #define        USB_VENDOR_AXIS 0x0792          /* Axis Communications */
 #define        USB_VENDOR_ABL  0x0794          /* ABL Electronics */
+#define        USB_VENDOR_SAGEM        0x079b          /* Sagem */
 #define        USB_VENDOR_SUNCOMM      0x079c          /* Sun Communications, Inc. */
 #define        USB_VENDOR_ALFADATA     0x079d          /* Alfadata Computer */
 #define        USB_VENDOR_NATIONALTECH 0x07a2          /* National Technical Systems */
 #define        USB_VENDOR_ARASAN       0x07da          /* Arasan Chip Systems */
 #define        USB_VENDOR_ALLIEDCABLE  0x07e6          /* Allied Cable */
 #define        USB_VENDOR_STSN 0x07ef          /* STSN */
+#define        USB_VENDOR_CENTURY      0x07f7          /* Century Corp */
 #define        USB_VENDOR_ZOOM 0x0803          /* Zoom Telephonics */
+#define        USB_VENDOR_PCS  0x0810          /* Personal Communication Systems */
 #define        USB_VENDOR_BROADLOGIC   0x0827          /* BroadLogic */
 #define        USB_VENDOR_HANDSPRING   0x082d          /* Handspring */
 #define        USB_VENDOR_PALM 0x0830          /* Palm Computing */
 #define        USB_VENDOR_ACCTON       0x083a          /* Accton Technology */
 #define        USB_VENDOR_DIAMOND      0x0841          /* Diamond */
 #define        USB_VENDOR_NETGEAR      0x0846          /* BayNETGEAR */
+#define        USB_VENDOR_TOPRE        0x0853          /* Topre Corporation */
 #define        USB_VENDOR_ACTIVEWIRE   0x0854          /* ActiveWire */
 #define        USB_VENDOR_BBELECTRONICS        0x0856          /* B&B Electronics */
 #define        USB_VENDOR_PORTGEAR     0x085a          /* PortGear */
 #define        USB_VENDOR_AUTHENTEC    0x08ff          /* AuthenTec */
 #define        USB_VENDOR_AUDIOTECHNICA        0x0909          /* Audio-Technica */
 #define        USB_VENDOR_TRUMPION     0x090a          /* Trumpion Microelectronics */
+#define        USB_VENDOR_FEIYA        0x090c          /* Feiya */
 #define        USB_VENDOR_ALATION      0x0910          /* Alation Systems */
 #define        USB_VENDOR_CONCORDCAMERA        0x0919          /* Concord Camera */
+#define        USB_VENDOR_GARMIN       0x091e          /* Garmin International */
 #define        USB_VENDOR_GOHUBS       0x0921          /* GoHubs */
+#define        USB_VENDOR_XEROX        0x0924          /* Xerox */
 #define        USB_VENDOR_BIOMETRIC    0x0929          /* American Biometric Company */
 #define        USB_VENDOR_TOSHIBA      0x0930          /* Toshiba */
 #define        USB_VENDOR_PLEXTOR      0x093b          /* Plextor */
 #define        USB_VENDOR_KINGSTON     0x0951          /* Kingston Technology */
 #define        USB_VENDOR_BLUEWATER    0x0956          /* BlueWater Systems */
 #define        USB_VENDOR_AGILENT      0x0957          /* Agilent Technologies */
+#define        USB_VENDOR_GUDE 0x0959          /* Gude ADS */
 #define        USB_VENDOR_PORTSMITH    0x095a          /* Portsmith */
 #define        USB_VENDOR_ACERW        0x0967          /* Acer */
 #define        USB_VENDOR_ADIRONDACK   0x0976          /* Adirondack Wire & Cable */
 #define        USB_VENDOR_ARRIS        0x09c1          /* Arris Interactive */
 #define        USB_VENDOR_ACTIVCARD    0x09c3          /* ACTIVCARD */
 #define        USB_VENDOR_ACTISYS      0x09c4          /* ACTiSYS */
+#define        USB_VENDOR_NOVATEL2     0x09d7          /* Novatel Wireless */
 #define        USB_VENDOR_AFOURTECH    0x09da          /* A-FOUR TECH */
 #define        USB_VENDOR_AIMEX        0x09dc          /* AIMEX */
 #define        USB_VENDOR_ADDONICS     0x09df          /* Addonics Technologies */
 #define        USB_VENDOR_TREK 0x0a16          /* Trek Technology */
 #define        USB_VENDOR_ASAHIOPTICAL 0x0a17          /* Asahi Optical */
 #define        USB_VENDOR_BOCASYSTEMS  0x0a43          /* Boca Systems */
+#define        USB_VENDOR_SHANTOU      0x0a46          /* ShanTou */
 #define        USB_VENDOR_MEDIAGEAR    0x0a48          /* MediaGear */
 #define        USB_VENDOR_BROADCOM     0x0a5c          /* Broadcom */
 #define        USB_VENDOR_GREENHOUSE   0x0a6b          /* GREENHOUSE */
 #define        USB_VENDOR_GEOCAST      0x0a79          /* Geocast Network Systems */
+#define        USB_VENDOR_IDQUANTIQUE  0x0aba          /* id Quantique */
+#define        USB_VENDOR_ZYDAS        0x0ace          /* Zydas Technology Corporation */
 #define        USB_VENDOR_NEODIO       0x0aec          /* Neodio */
 #define        USB_VENDOR_VODAFONE     0x0af0          /* Vodafone */
-#define        USB_VENDOR_ASUS 0x0b05          /* ASUS */
+#define        USB_VENDOR_ASUS 0x0b05          /* ASUSTeK Computer */
 #define        USB_VENDOR_TODOS        0x0b0c          /* Todos Data System */
 #define        USB_VENDOR_SIIG2        0x0b39          /* SIIG */
 #define        USB_VENDOR_TEKRAM       0x0b3b          /* Tekram Technology */
 #define        USB_VENDOR_ZEEVO        0x0b7a          /* Zeevo, Inc. */
 #define        USB_VENDOR_KURUSUGAWA   0x0b7e          /* Kurusugawa Electronics, Inc. */
 #define        USB_VENDOR_ASIX 0x0b95          /* ASIX Electronics */
+#define        USB_VENDOR_O2MICRO      0x0b97          /* O2 Micro, Inc. */
 #define        USB_VENDOR_USR  0x0baf          /* U.S. Robotics */
+#define        USB_VENDOR_AMBIT        0x0bb2          /* Ambit Microsystems */
 #define        USB_VENDOR_REALTEK      0x0bda          /* Realtek */
 #define        USB_VENDOR_ADDONICS2    0x0bf6          /* Addonics Technology */
 #define        USB_VENDOR_AGATE        0x0c08          /* Agate Technologies */
 #define        USB_VENDOR_CHICONY2     0x0c45          /* Chicony Electronics */
 #define        USB_VENDOR_SEALEVEL     0x0c52          /* Sealevel System */
 #define        USB_VENDOR_LUWEN        0x0c76          /* EasyDisk */
+#define        USB_VENDOR_KYOCERA2     0x0c88          /* Kyocera Wireless Corp. */
 #define        USB_VENDOR_ZCOM 0x0cde          /* Z-Com */
+#define        USB_VENDOR_ATHEROS2     0x0cf3          /* Atheros Communications */
 #define        USB_VENDOR_TANGTOP      0x0d3d          /* Tangtop */
 #define        USB_VENDOR_SMC3 0x0d5c          /* Standard Microsystems */
 #define        USB_VENDOR_PEN  0x0d7d          /* Pen Drive */
-#define        USB_VENDOR_PNY  0x0d7d          /* PNY */
 #define        USB_VENDOR_ACDC 0x0d7e          /* American Computer & Digital Components */
 #define        USB_VENDOR_ABC  0x0d8c          /* ABC */
-#define        USB_VENDOR_MSI  0x0db0          /* Micro Star */
+#define        USB_VENDOR_CONCEPTRONIC 0x0d8e          /* Conceptronic */
+#define        USB_VENDOR_SKANHEX      0x0d96          /* Skanhex Technology, Inc. */
+#define        USB_VENDOR_MSI  0x0db0          /* Micro Star International */
+#define        USB_VENDOR_ELCON        0x0db7          /* ELCON Systemtechnik */
+#define        USB_VENDOR_NETAC        0x0dd8          /* Netac */
 #define        USB_VENDOR_SITECOMEU    0x0df6          /* Sitecom Europe */
+#define        USB_VENDOR_MOBILEACTION 0x0df7          /* Mobile Action */
+#define        USB_VENDOR_SPEEDDRAGON  0x0e55          /* Speed Dragon Multimedia */
 #define        USB_VENDOR_HAWKING      0x0e66          /* Hawking */
+#define        USB_VENDOR_FOSSIL       0x0e67          /* Fossil, Inc */
+#define        USB_VENDOR_GMATE        0x0e7e          /* G.Mate, Inc */
 #define        USB_VENDOR_OTI  0x0ea0          /* Ours Technology */
-#define        USB_VENDOR_NOVATECH     0x0eb0          /* Nova Technology */
 #define        USB_VENDOR_PILOTECH     0x0eaf          /* Pilotech */
-#define        USB_VENDOR_EGALAX       0x0eef          /* eGalax */
+#define        USB_VENDOR_NOVATECH     0x0eb0          /* Nova Technology */
+#define        USB_VENDOR_ITEGNO       0x0eba          /* iTegno */
+#define        USB_VENDOR_WINMAXGROUP  0x0ed1          /* WinMaxGroup */
+#define        USB_VENDOR_TOD  0x0ede          /* TOD */
+#define        USB_VENDOR_EGALAX       0x0eef          /* eGalax, Inc. */
+#define        USB_VENDOR_AIRPRIME     0x0f3d          /* AirPrime, Inc. */
 #define        USB_VENDOR_MICROTUNE    0x0f4d          /* Microtune, Inc. */
 #define        USB_VENDOR_VTECH        0x0f88          /* VTech */
+#define        USB_VENDOR_FALCOM       0x0f94          /* Falcom Wireless Communications GmbH */
+#define        USB_VENDOR_RIM  0x0fca          /* Research In Motion */
+#define        USB_VENDOR_DYNASTREAM   0x0fcf          /* Dynastream Innovations */
 #define        USB_VENDOR_QUALCOMM2    0x1004          /* Qualcomm */
+#define        USB_VENDOR_DESKNOTE     0x1019          /* Desknote */
 #define        USB_VENDOR_GIGABYTE     0x1044          /* GIGABYTE */
 #define        USB_VENDOR_WESTERN      0x1058          /* Western Digital */
 #define        USB_VENDOR_MOTOROLA     0x1063          /* Motorola */
 #define        USB_VENDOR_CCYU 0x1065          /* CCYU Technology */
+#define        USB_VENDOR_CURITEL      0x106c          /* Curitel Communications Inc */
+#define        USB_VENDOR_SILABS2      0x10a6          /* SILABS2 */
+#define        USB_VENDOR_USI  0x10ab          /* USI */
 #define        USB_VENDOR_PLX  0x10b5          /* PLX */
 #define        USB_VENDOR_ASANTE       0x10bd          /* Asante */
+#define        USB_VENDOR_SILABS       0x10c4          /* Silicon Labs */
+#define        USB_VENDOR_ANALOG       0x1110          /* Analog Devices */
+#define        USB_VENDOR_TENX 0x1130          /* Ten X Technology, Inc. */
+#define        USB_VENDOR_ISSC 0x1131          /* Integrated System Solution Corp. */
 #define        USB_VENDOR_JRC  0x1145          /* Japan Radio Company */
 #define        USB_VENDOR_SPHAIRON     0x114b          /* Sphairon Access Systems GmbH */
 #define        USB_VENDOR_DELORME      0x1163          /* DeLorme Publishing */
 #define        USB_VENDOR_SERVERWORKS  0x1166          /* ServerWorks */
 #define        USB_VENDOR_ACERCM       0x1189          /* Acer Communications & Multimedia */
+#define        USB_VENDOR_SIERRA       0x1199          /* Sierra Wireless */
+#define        USB_VENDOR_TOPFIELD     0x11db          /* Topfield Co., Ltd */
+#define        USB_VENDOR_SIEMENS3     0x11f5          /* Siemens */
 #define        USB_VENDOR_PROLIFIC2    0x11f6          /* Prolific */
+#define        USB_VENDOR_ALCATEL      0x11f7          /* Alcatel */
+#define        USB_VENDOR_UNKNOWN3     0x1233          /* Unknown vendor */
 #define        USB_VENDOR_TSUNAMI      0x1241          /* Tsunami */
+#define        USB_VENDOR_PHEENET      0x124a          /* Pheenet */
+#define        USB_VENDOR_TARGUS       0x1267          /* Targus */
 #define        USB_VENDOR_TWINMOS      0x126f          /* TwinMOS */
+#define        USB_VENDOR_TENDA        0x1286          /* Tenda */
 #define        USB_VENDOR_CREATIVE2    0x1292          /* Creative Labs */
 #define        USB_VENDOR_BELKIN2      0x1293          /* Belkin Components */
+#define        USB_VENDOR_CYBERTAN     0x129b          /* CyberTAN Technology */
+#define        USB_VENDOR_HUAWEI       0x12d1          /* Huawei Technologies */
+#define        USB_VENDOR_ARANEUS      0x12d8          /* Araneus Information Systems */
+#define        USB_VENDOR_TAPWAVE      0x12ef          /* Tapwave */
 #define        USB_VENDOR_AINCOMM      0x12fd          /* Aincomm */
 #define        USB_VENDOR_MOBILITY     0x1342          /* Mobility */
 #define        USB_VENDOR_DICKSMITH    0x1371          /* Dick Smith Electronics */
-#define        USB_VENDOR_LINKSYS4     0x13b1          /* Linksys */
+#define        USB_VENDOR_NETGEAR3     0x1385          /* Netgear */
+#define        USB_VENDOR_BALTECH      0x13ad          /* Baltech */
+#define        USB_VENDOR_CISCOLINKSYS 0x13b1          /* Cisco-Linksys */
 #define        USB_VENDOR_SHARK        0x13d2          /* Shark */
+#define        USB_VENDOR_NOVATEL      0x1410          /* Novatel Wireless */
+#define        USB_VENDOR_WISTRONNEWEB 0x1435          /* Wistron NeWeb */
 #define        USB_VENDOR_RADIOSHACK   0x1453          /* Radio Shack */
 #define        USB_VENDOR_HUAWEI3COM   0x1472          /* Huawei 3Com */
 #define        USB_VENDOR_SILICOM      0x1485          /* Silicom */
 #define        USB_VENDOR_RALINK       0x148f          /* Ralink Technology */
 #define        USB_VENDOR_IMAGINATION  0x149a          /* Imagination Technologies */
-#define        USB_VENDOR_CONCEPTRONIC 0x14b2          /* Conceptronic */
+#define        USB_VENDOR_CONCEPTRONIC2        0x14b2          /* Conceptronic */
+#define        USB_VENDOR_PLANEX3      0x14ea          /* Planex Communications */
 #define        USB_VENDOR_SILICONPORTALS       0x1527          /* Silicon Portals */
+#define        USB_VENDOR_UBIQUAM      0x1529          /* UBIQUAM Co., Ltd. */
+#define        USB_VENDOR_UBLOX        0x1546          /* U-blox */
+#define        USB_VENDOR_PNY  0x154b          /* PNY */
+#define        USB_VENDOR_OQO  0x1557          /* OQO */
+#define        USB_VENDOR_UMEDIA       0x157e          /* U-MEDIA Communications */
+#define        USB_VENDOR_FIBERLINE    0x1582          /* Fiberline */
 #define        USB_VENDOR_SOHOWARE     0x15e8          /* SOHOware */
 #define        USB_VENDOR_UMAX 0x1606          /* UMAX Data Systems */
 #define        USB_VENDOR_INSIDEOUT    0x1608          /* Inside Out Networks */
 #define        USB_VENDOR_GOODWAY      0x1631          /* Good Way Technology */
 #define        USB_VENDOR_ENTREGA      0x1645          /* Entrega */
 #define        USB_VENDOR_ACTIONTEC    0x1668          /* Actiontec Electronics */
+#define        USB_VENDOR_ATHEROS      0x168c          /* Atheros Communications */
 #define        USB_VENDOR_GIGASET      0x1690          /* Gigaset */
+#define        USB_VENDOR_GLOBALSUN    0x16ab          /* Global Sun Technology */
+#define        USB_VENDOR_ANYDATA      0x16d5          /* AnyDATA Corporation */
+#define        USB_VENDOR_JABLOTRON    0x16d6          /* Jablotron */
+#define        USB_VENDOR_CMOTECH      0x16d8          /* CMOTECH Co., Ltd. */
+#define        USB_VENDOR_LINKSYS4     0x1737          /* Linksys */
+#define        USB_VENDOR_SENAO        0x1740          /* Senao */
+#define        USB_VENDOR_METAGEEK     0x1781          /* MetaGeek */
 #define        USB_VENDOR_AMIT 0x18c5          /* AMIT */
 #define        USB_VENDOR_QCOM 0x18e8          /* Qcom */
 #define        USB_VENDOR_LINKSYS3     0x1915          /* Linksys */
 #define        USB_VENDOR_PLANEX       0x2c02          /* Planex Communications */
 #define        USB_VENDOR_VIDZMEDIA    0x3275          /* VidzMedia Pte Ltd */
 #define        USB_VENDOR_AEI  0x3334          /* AEI */
+#define        USB_VENDOR_HANK 0x3353          /* Hank Connection */
 #define        USB_VENDOR_PQI  0x3538          /* PQI */
 #define        USB_VENDOR_DAISY        0x3579          /* Daisy Technology */
 #define        USB_VENDOR_NI   0x3923          /* National Instruments */
 #define        USB_VENDOR_IODATA2      0x40bb          /* I-O Data */
 #define        USB_VENDOR_IRIVER       0x4102          /* iRiver */
 #define        USB_VENDOR_DELL 0x413c          /* Dell */
+#define        USB_VENDOR_WCH  0x4348          /* QinHeng Electronics */
+#define        USB_VENDOR_ACEECA       0x4766          /* Aceeca */
 #define        USB_VENDOR_AVERATEC     0x50c2          /* Averatec */
+#define        USB_VENDOR_SWEEX        0x5173          /* Sweex */
 #define        USB_VENDOR_ONSPEC2      0x55aa          /* OnSpec Electronic Inc. */
 #define        USB_VENDOR_ZINWELL      0x5a57          /* Zinwell */
 #define        USB_VENDOR_SITECOM      0x6189          /* Sitecom */
+#define        USB_VENDOR_ARKMICRO     0x6547          /* Arkmicro Technologies Inc. */
+#define        USB_VENDOR_3COM2        0x6891          /* 3Com */
 #define        USB_VENDOR_INTEL        0x8086          /* Intel */
+#define        USB_VENDOR_SITECOM2     0x9016          /* Sitecom */
+#define        USB_VENDOR_MOSCHIP      0x9710          /* MosChip Semiconductor */
+#define        USB_VENDOR_3COM3        0xa727          /* 3Com */
 #define        USB_VENDOR_HP2  0xf003          /* Hewlett Packard */
+#define        USB_VENDOR_USRP 0xfffe          /* GNU Radio USRP */
 
 /*
  * List of known products.  Grouped by vendor.
 #define        USB_PRODUCT_3COM_3CREB96        0x00a0          /* Bluetooth USB Adapter */
 #define        USB_PRODUCT_3COM_3C19250        0x03e8          /* 3C19250 Ethernet adapter */
 #define        USB_PRODUCT_3COM_3CRSHEW696     0x0a01          /* 3CRSHEW696 Wireless adapter */
-#define        USB_PRODUCT_3COM_USR56K 0x3021          /* U.S.Robotics 56000 Voice Faxmodem Pro */
 #define        USB_PRODUCT_3COM_3C460  0x11f8          /* HomeConnect 3C460 */
+#define        USB_PRODUCT_3COM_USR56K 0x3021          /* U.S.Robotics 56000 Voice Faxmodem Pro */
 #define        USB_PRODUCT_3COM_3C460B 0x4601          /* HomeConnect 3C460B */
+#define        USB_PRODUCT_3COM2_3CRUSB10075   0xa727          /* 3CRUSB10075 */
+#define        USB_PRODUCT_3COM3_AR5523_1      0x6893          /* AR5523 */
+#define        USB_PRODUCT_3COM3_AR5523_2      0x6895          /* AR5523 */
+#define        USB_PRODUCT_3COM3_AR5523_3      0x6897          /* AR5523 */
 
 #define        USB_PRODUCT_3COMUSR_OFFICECONN  0x0082          /* 3Com OfficeConnect Analog Modem */
 #define        USB_PRODUCT_3COMUSR_USRISDN     0x008f          /* 3Com U.S. Robotics Pro ISDN TA */
 #define        USB_PRODUCT_ABOCOM_XX8  0x4102          /* XX8 */
 #define        USB_PRODUCT_ABOCOM_XX9  0x4104          /* XX9 */
 #define        USB_PRODUCT_ABOCOM_UFE2000      0x420a          /* UFE2000 USB2.0 Fast Ethernet Adapter */
+#define        USB_PRODUCT_ABOCOM_WL54 0x6001          /* WL54 */
 #define        USB_PRODUCT_ABOCOM_XX10 0xabc1          /* XX10 */
-#define        USB_PRODUCT_ABOCOM_RT2573       0xb21d          /* RT2573 */
 #define        USB_PRODUCT_ABOCOM_HWU54DM      0xb21b          /* HWU54DM */
-#define        USB_PRODUCT_ABOCOM_RT2573_1     0xb21c          /* RT2573 */
-#define        USB_PRODUCT_ABOCOM_RT2573_2     0xb21e          /* RT2573 */
+#define        USB_PRODUCT_ABOCOM_RT2573_2     0xb21c          /* RT2573 */
+#define        USB_PRODUCT_ABOCOM_RT2573_3     0xb21d          /* RT2573 */
+#define        USB_PRODUCT_ABOCOM_RT2573_4     0xb21e          /* RT2573 */
 #define        USB_PRODUCT_ABOCOM_WUG2700      0xb21f          /* WUG2700 */
 
 /* Accton products */
 #define        USB_PRODUCT_ACCTON_USB320_EC    0x1046          /* USB320-EC Ethernet Adapter */
+#define        USB_PRODUCT_ACCTON_2664W        0x3501          /* 2664W */
 #define        USB_PRODUCT_ACCTON_111  0x3503          /* T-Sinus 111 WLAN */
+#define        USB_PRODUCT_ACCTON_SMCWUSBG     0x4505          /* SMCWUSB-G */
 #define        USB_PRODUCT_ACCTON_SS1001       0x5046          /* SpeedStream Ethernet Adapter */
+#define        USB_PRODUCT_ACCTON_ZD1211B      0xe501          /* ZD1211B */
+
+/* Aceeca products */
+#define        USB_PRODUCT_ACEECA_MEZ1000      0x0001          /* MEZ1000 RDA */
+
+/* Acer Communications & Multimedia (oemd by Surecom) */
+#define        USB_PRODUCT_ACERCM_EP1427X2     0x0893          /* EP-1427X-2 Ethernet Adapter */
+
+/* Acer Labs products */
+#define        USB_PRODUCT_ACERLABS_M5632      0x5632          /* USB 2.0 Data Link */
 
 /* Acer Peripherals, Inc. products */
 #define        USB_PRODUCT_ACERP_ACERSCAN_C310U        0x12a6          /* Acerscan C310U */
 #define        USB_PRODUCT_ACERP_ACERSCAN_320U 0x2022          /* Acerscan 320U */
 #define        USB_PRODUCT_ACERP_ACERSCAN_640U 0x2040          /* Acerscan 640U */
 #define        USB_PRODUCT_ACERP_ACERSCAN_620U 0x2060          /* Acerscan 620U */
-#define        USB_PRODUCT_ACERP_ATAPI 0x6003          /* ATA/ATAPI adapter */
-#define        USB_PRODUCT_ACERP_AWL300        0x9000          /* AWL300 */
-#define        USB_PRODUCT_ACERP_AWL400        0x9001          /* AWL400 */
-
-/* Acer Products */
+#define        USB_PRODUCT_ACERP_ACERSCAN_4300U        0x20b0          /* Benq 3300U/4300U */
+#define        USB_PRODUCT_ACERP_ACERSCAN_640BT        0x20be          /* Acerscan 640BT */
+#define        USB_PRODUCT_ACERP_ACERSCAN_1240U        0x20c0          /* Acerscan 1240U */
+#define        USB_PRODUCT_ACERP_ATAPI 0x6003          /* ATA/ATAPI Adapter */
+#define        USB_PRODUCT_ACERP_AWL300        0x9000          /* AWL300 Wireless Adapter */
+#define        USB_PRODUCT_ACERP_AWL400        0x9001          /* AWL400 Wireless Adapter */
+
+/* Acer Warp products */
 #define        USB_PRODUCT_ACERW_WARPLINK      0x0204          /* Warplink */
 
 /* Actiontec products */
 #define        USB_PRODUCT_ACTIONTEC_UAT1      0x7605          /* UAT1 Wireless Ethernet adapter */
 
 /* ADMtek products */
-#define        USB_PRODUCT_ADMTEK_PEGASUS      0x0986          /* AN986 USB Ethernet */
-#define        USB_PRODUCT_ADMTEK_PEGASUSII    0x8511          /* AN8511 USB Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUSII_4  0x07c2          /* AN986A Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUS      0x0986          /* AN986 Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUSII    0x8511          /* AN8511 Ethernet */
 #define        USB_PRODUCT_ADMTEK_PEGASUSII_2  0x8513          /* AN8513 Ethernet */
+#define        USB_PRODUCT_ADMTEK_PEGASUSII_3  0x8515          /* AN8515 Ethernet */
+
+/* Addonics products */
+#define        USB_PRODUCT_ADDONICS2_CABLE_205 0xa001          /* Cable 205 */
+
+/* Addtron products */
+#define        USB_PRODUCT_ADDTRON_AWU120      0xff31          /* AWU-120 */
 
 /* ADS products */
 #define        USB_PRODUCT_ADS_UBS10BT 0x0008          /* UBS-10BT Ethernet */
 #define        USB_PRODUCT_AGFA_SNAPSCANE26    0x2097          /* SnapScan e26 */
 #define        USB_PRODUCT_AGFA_SNAPSCANE52    0x20fd          /* SnapScan e52 */
 
+/* Aincomm products */
+#define        USB_PRODUCT_AINCOMM_AWU2000B    0x1001          /* AWU2000B */
+
 /* AIPTEK International products */
 #define        USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3     0x504a          /* PenCam Mega 1.3 */
 
-/* Aincomm products */
-#define        USB_PRODUCT_AINCOMM_AWU2000B    0x1001          /* AWU2000B */
+/* AirPrime products */
+#define        USB_PRODUCT_AIRPRIME_PC5220     0x0112          /* CDMA Wireless PC Card */
 
 /* AKS products */
 #define        USB_PRODUCT_AKS_USBHASP 0x0001          /* USB-HASP 0.06 */
 #define        USB_PRODUCT_ALCOR_SM_KBD        0x9410          /* MicroConnectors/StrongMan Keyboard */
 #define        USB_PRODUCT_ALCOR_NEC_KBD_HUB   0x9472          /* NEC Kbd Hub */
 
+/* Allied Telesyn International products */
+#define        USB_PRODUCT_ALLIEDTELESYN_ATUSB100      0xb100          /* AT-USB100 */
+
 /* Altec Lansing products */
 #define        USB_PRODUCT_ALTEC_ADA70 0x0070          /* ADA70 Speakers */
 #define        USB_PRODUCT_ALTEC_ASC495        0xff05          /* ASC495 Speakers */
 
-/* American Power Conversion products */
-#define        USB_PRODUCT_APC_UPSPRO500       0x0002          /* Back-UPS Pro 500 */
+/* Ambit Microsystems products */
+#define        USB_PRODUCT_AMBIT_WLAN  0x0302          /* WLAN */
+#define        USB_PRODUCT_AMBIT_NTL_250       0x6098          /* NTL 250 cable modem */
 
 /* AMIT products */
 #define        USB_PRODUCT_AMIT_CGWLUSB2GO     0x0002          /* CG-WLUSB2GO */
 #define        USB_PRODUCT_ANCHOR_EZUSB        0x2131          /* EZUSB */
 #define        USB_PRODUCT_ANCHOR_EZLINK       0x2720          /* EZLINK */
 
+/* AnyData products */
+#define        USB_PRODUCT_ANYDATA_ADU_E100X   0x6501          /* CDMA 2000 1xRTT/EV-DO USB Modem */
+
 /* AOX, Inc. products */
 #define        USB_PRODUCT_AOX_USB101  0x0008          /* USB ethernet controller engine */
 
+/* American Power Conversion products */
+#define        USB_PRODUCT_APC_UPSPRO500       0x0002          /* Back-UPS Pro 500 */
+
 /* Apple Computer products */
 #define        USB_PRODUCT_APPLE_OPTMOUSE      0x0302          /* Optical mouse */
 #define        USB_PRODUCT_APPLE_SPEAKERS      0x1101          /* Speakers */
+#define        USB_PRODUCT_APPLE_IPOD  0x1201          /* iPod */
+#define        USB_PRODUCT_APPLE_IPOD2G        0x1202          /* iPod 2G */
+#define        USB_PRODUCT_APPLE_IPOD3G        0x1203          /* iPod 3G */
+#define        USB_PRODUCT_APPLE_IPOD_04       0x1204          /* iPod '04' */
+#define        USB_PRODUCT_APPLE_IPODMINI      0x1205          /* iPod Mini */
+#define        USB_PRODUCT_APPLE_IPOD_06       0x1206          /* iPod '06' */
+#define        USB_PRODUCT_APPLE_IPOD_07       0x1207          /* iPod '07' */
+#define        USB_PRODUCT_APPLE_IPOD_08       0x1208          /* iPod '08' */
+#define        USB_PRODUCT_APPLE_IPODVIDEO     0x1209          /* iPod Video */
+#define        USB_PRODUCT_APPLE_IPODNANO      0x120a          /* iPod Nano */
+
+/* Arkmicro Technologies */
+#define        USB_PRODUCT_ARKMICRO_ARK3116    0x0232          /* ARK3116 Serial */
 
 /* Asahi Optical products */
 #define        USB_PRODUCT_ASAHIOPTICAL_OPTIO230       0x0004          /* PENTAX Optio230 */
 
 /* ASIX Electronics products */
 #define        USB_PRODUCT_ASIX_AX88172        0x1720          /* USB 2.0 10/100 ethernet controller */
+#define        USB_PRODUCT_ASIX_AX88178        0x1780          /* AX88178 */
+#define        USB_PRODUCT_ASIX_AX88772        0x7720          /* AX88772 */
 
 /* ASUS products */
 #define        USB_PRODUCT_ASUS_WL167G 0x1707          /* WL-167g wireless adapter */
 /* ATen products */
 #define        USB_PRODUCT_ATEN_UC1284 0x2001          /* Parallel printer adapter */
 #define        USB_PRODUCT_ATEN_UC10T  0x2002          /* 10Mbps ethernet adapter */
+#define        USB_PRODUCT_ATEN_UC110T 0x2007          /* UC-110T ethernet adapter */
 #define        USB_PRODUCT_ATEN_UC232A 0x2008          /* Serial adapter */
+#define        USB_PRODUCT_ATEN_UC210T 0x2009          /* UC-210T ethernet adapter */
 #define        USB_PRODUCT_ATEN_DSB650C        0x4000          /* DSB-650C */
 
+/* Atheros Communications products */
+#define        USB_PRODUCT_ATHEROS_AR5523      0x0001          /* AR5523 */
+#define        USB_PRODUCT_ATHEROS_AR5523_NF   0x0002          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_ATHEROS2_AR5523_1   0x0001          /* AR5523 */
+#define        USB_PRODUCT_ATHEROS2_AR5523_1_NF        0x0002          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_ATHEROS2_AR5523_2   0x0003          /* AR5523 */
+#define        USB_PRODUCT_ATHEROS2_AR5523_2_NF        0x0004          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_ATHEROS2_AR5523_3   0x0005          /* AR5523 */
+#define        USB_PRODUCT_ATHEROS2_AR5523_3_NF        0x0006          /* AR5523 (no firmware) */
+
 /* ATI products */
 #define        USB_PRODUCT_ATI2_205    0xa001          /* USB Cable 205 */
 
 /* Belkin products */
 /*product BELKIN F5U111                0x????  F5U111 Ethernet adapter*/
 #define        USB_PRODUCT_BELKIN2_F5U002      0x0002          /* F5U002 Parallel printer adapter */
+#define        USB_PRODUCT_BELKIN_F5D6050      0x0050          /* F5D6050 802.11b Wireless adapter */
+#define        USB_PRODUCT_BELKIN_FBT001V      0x0081          /* FBT001v2 Bluetooth */
+#define        USB_PRODUCT_BELKIN_FBT003V      0x0084          /* FBT003v2 Bluetooth */
 #define        USB_PRODUCT_BELKIN_F5U103       0x0103          /* F5U103 Serial adapter */
 #define        USB_PRODUCT_BELKIN_F5U109       0x0109          /* F5U109 Serial adapter */
-#define        USB_PRODUCT_BELKIN_F5U409       0x0409          /* F5U409 Serial */
 #define        USB_PRODUCT_BELKIN_SCSI 0x0115          /* SCSI Adaptor */
 #define        USB_PRODUCT_BELKIN_USB2LAN      0x0121          /* USB to LAN Converter */
 #define        USB_PRODUCT_BELKIN_F5U208       0x0208          /* F5U208 VideoBus II */
 #define        USB_PRODUCT_BELKIN_F5U237       0x0237          /* F5U237 USB 2.0 7-Port Hub */
+#define        USB_PRODUCT_BELKIN_F5U257       0x0257          /* F5U257 Serial */
 #define        USB_PRODUCT_BELKIN_F5U409       0x0409          /* F5U409 Serial adapter */
+#define        USB_PRODUCT_BELKIN_F6C550AVR    0x0551          /* F6C550-AVR UPS */
 #define        USB_PRODUCT_BELKIN_UPS  0x0980          /* UPS */
 #define        USB_PRODUCT_BELKIN_F5U120       0x1203          /* F5U120-PC Hub */
+#define        USB_PRODUCT_BELKIN_ZD1211B      0x4050          /* ZD1211B */
+#define        USB_PRODUCT_BELKIN_F5D5055      0x5055          /* F5D5055 */
 #define        USB_PRODUCT_BELKIN_F5D7050      0x7050          /* F5D7050 wireless adapter */
+#define        USB_PRODUCT_BELKIN_F5D7051      0x7051          /* F5D7051 54g USB Network Adapter */
 #define        USB_PRODUCT_BELKIN_F5D7050A     0x705a          /* F5D705A 54g USB Network Adapter */
 #define        USB_PRODUCT_BELKIN_F5D9050V3    0x905b          /* F5D9050 ver 3 */
+#define        USB_PRODUCT_BELKIN_F5D7050_V4000        0x705c          /* F5D7050 v4000 wireless adapter */
+#define        USB_PRODUCT_BELKIN_F5D9050V3    0x905b          /* F5D9050 ver 3 wireless adapter */
+#define        USB_PRODUCT_BELKIN2_F5U002      0x0002          /* F5U002 Parallel printer */
 
 /* Billionton products */
 #define        USB_PRODUCT_BILLIONTON_USB100   0x0986          /* USB100N 10/100 FastEthernet Adapter */
 #define        USB_PRODUCT_BILLIONTON_USBLP100 0x0987          /* USB100LP */
 #define        USB_PRODUCT_BILLIONTON_USBEL100 0x0988          /* USB100EL */
 #define        USB_PRODUCT_BILLIONTON_USBE100  0x8511          /* USBE100 */
+#define        USB_PRODUCT_BILLIONTON_USB2AR   0x90ff          /* USB2AR Ethernet */
 
 /* Broadcom products */
 #define        USB_PRODUCT_BROADCOM_BCM2033    0x2000          /* BCM2033 */
 /* Canon, Inc. products */
 #define        USB_PRODUCT_CANON_N656U 0x2206          /* CanoScan N656U */
 #define        USB_PRODUCT_CANON_N1220U        0x2207          /* CanoScan N1220U */
-#define        USB_PRODUCT_CANON_N676U 0x220d          /* CanoScan N676U */
 #define        USB_PRODUCT_CANON_D660U 0x2208          /* CanoScan D660U */
+#define        USB_PRODUCT_CANON_N676U 0x220d          /* CanoScan N676U */
 #define        USB_PRODUCT_CANON_N1240U        0x220e          /* CanoScan N1240U */
+#define        USB_PRODUCT_CANON_LIDE25        0x2220          /* CanoScan LIDE 25 */
 #define        USB_PRODUCT_CANON_S10   0x3041          /* PowerShot S10 */
 #define        USB_PRODUCT_CANON_S20   0x3043          /* PowerShot S20 */
 #define        USB_PRODUCT_CANON_S100  0x3045          /* PowerShot S100 */
 /* CCYU Technology products */
 #define        USB_PRODUCT_CCYU_EASYDISK       0x2136          /* EasyDisk Portable Device */
 
+/* Century products */
+#define        USB_PRODUCT_CENTURY_EX35QUAT    0x011e          /* Century USB Disk Enclosure */
+
 /* Cherry products */
 #define        USB_PRODUCT_CHERRY_MY3000KBD    0x0001          /* My3000 keyboard */
 #define        USB_PRODUCT_CHERRY_MY3000HUB    0x0003          /* My3000 hub */
 #define        USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK     0x00f3          /* Fighterstick */
 #define        USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE       0x00ff          /* Flight Sim Yoke */
 
+/* Cisco-Linksys products */
+#define        USB_PRODUCT_CISCOLINKSYS_WUSB54G        0x000d          /* WUSB54G wireless adapter */
+#define        USB_PRODUCT_CISCOLINKSYS_WUSB54GP       0x0011          /* WUSB54GP wireless adapter */
+#define        USB_PRODUCT_CISCOLINKSYS_USB200MV2      0x0018          /* USB200M v2 */
+#define        USB_PRODUCT_CISCOLINKSYS_HU200TS        0x001a          /* HU200TS wireless adapter */
+#define        USB_PRODUCT_CISCOLINKSYS_WUSB54GC       0x0020          /* WUSB54GC */
+#define        USB_PRODUCT_CISCOLINKSYS_WUSB54GR       0x0023          /* WUSB54GR */
+#define        USB_PRODUCT_CISCOLINKSYS_WUSBF54G       0x0024          /* WUSBF54G */
+
+/* CMOTECH products */
+#define        USB_PRODUCT_CMOTECH_CNU510      0x5141          /* CMOTECH CDMA Technologies USB modem */
+#define        USB_PRODUCT_CMOTECH_CNU550      0x5543          /* CDMA 2000 1xRTT/1xEVDO USB modem */
+#define        USB_PRODUCT_CMOTECH_CDMA_MODEM1 0x6280          /* CMOTECH CDMA Technologies USB modem */
+
 /* Compaq products */
 #define        USB_PRODUCT_COMPAQ_IPAQPOCKETPC 0x0003          /* iPAQ PocketPC */
 #define        USB_PRODUCT_COMPAQ_A1500        0x0012          /* A1500 */
 #define        USB_PRODUCT_COMPOSITE_USBPS2    0x0001          /* USB to PS2 Adaptor */
 
 /* Conceptronic products */
-#define        USB_PRODUCT_CONCEPTRONIC_C54U   0x3c02          /* C54U wireless adapter */
-#define        USB_PRODUCT_CONCEPTRONIC_C54RU2 0x3c22          /* C54RU */
+#define        USB_PRODUCT_CONCEPTRONIC_C11U   0x7100          /* C11U */
+#define        USB_PRODUCT_CONCEPTRONIC_WL210  0x7110          /* WL-210 */
+#define        USB_PRODUCT_CONCEPTRONIC_AR5523_1       0x7801          /* AR5523 */
+#define        USB_PRODUCT_CONCEPTRONIC_AR5523_1_NF    0x7802          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_CONCEPTRONIC_AR5523_2       0x7811          /* AR5523 */
+#define        USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF    0x7812          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_CONCEPTRONIC2_C54RU 0x3c02          /* C54RU WLAN */
+#define        USB_PRODUCT_CONCEPTRONIC2_C54RU2        0x3c22          /* C54RU */
 
 /* Concord Camera products */
 #define        USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X      0x0100          /* Eye Q 3x */
 #define        USB_PRODUCT_COREGA_WLANUSB      0x0012          /* Wireless LAN USB Stick-11 */
 #define        USB_PRODUCT_COREGA_FETHER_USB2_TX       0x0017          /* FEther USB2-TX */
 #define        USB_PRODUCT_COREGA_WLUSB_11_KEY 0x001a          /* ULUSB-11 Key */
+#define        USB_PRODUCT_COREGA_WLUSB_11_STICK       0x7613          /* WLAN USB Stick 11 */
 #define        USB_PRODUCT_COREGA_FETHER_USB_TXC       0x9601          /* FEther USB-TXC */
 
 /* Creative products */
 
 #define        USB_PRODUCT_CREATIVE2_VOIP_BLASTER      0x0258          /* Voip Blaster */
 
+#define        USB_PRODUCT_CREATIVE3_OPTICAL_MOUSE     0x0001          /* Notebook Optical Mouse */
+
 /* Crystalfontz products */
 #define        USB_PRODUCT_FTDI_CFA_631        0xfc0c          /* Crystalfontz CFA-631 USB LCD */
 #define        USB_PRODUCT_FTDI_CFA_632        0xfc08          /* Crystalfontz CFA-632 USB LCD */
 /* CTX products */
 #define        USB_PRODUCT_CTX_EX1300  0x9999          /* Ex1300 hub */
 
+/* Curitel products */
+#define        USB_PRODUCT_CURITEL_HX550C      0x1101          /* CDMA 2000 1xRTT USB modem (HX-550C) */
+#define        USB_PRODUCT_CURITEL_HX57XB      0x2101          /* CDMA 2000 1xRTT USB modem (HX-570/575B/PR-600) */
+#define        USB_PRODUCT_CURITEL_PC5740      0x3701          /* Broadband wireless modem */
+
 /* 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_WISPY       0x0bad          /* MetaGeek Wi-Spy */
 #define        USB_PRODUCT_CYPRESS_FMRADIO     0x1002          /* FM Radio */
 #define        USB_PRODUCT_CYPRESS_SLIM_HUB    0x6560          /* Slim Hub */
 
 #define        USB_PRODUCT_DELL_X30    0x4003          /* Dell Axim X30 PDA */
 #define        USB_PRODUCT_DELL_BC02   0x8000          /* Dell BC02 Bluetooth USB Adapter */
 #define        USB_PRODUCT_DELL_TM1180 0x8100          /* TrueMobile 1180 WLAN */
+#define        USB_PRODUCT_DELL_TM350  0x8103          /* TrueMobile 350 Bluetooth USB Adapter */
 
 /* Delorme Paublishing products */
 #define        USB_PRODUCT_DELORME_EARTHMATE   0x0100          /* Earthmate GPS */
 
+/* Desknote products */
+#define        USB_PRODUCT_DESKNOTE_UCR_61S2B  0x0c55          /* UCR-61S2B */
+
 /* Diamond products */
 #define        USB_PRODUCT_DIAMOND_RIO500USB   0x0001          /* Rio 500 USB */
 
 /*product DLINK DSBS25         0x0100  DSB-S25 serial adapter*/
 #define        USB_PRODUCT_DLINK_DUBE100       0x1a00          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX4     0x200c          /* 10/100 ethernet adapter */
-#define        USB_PRODUCT_DLINK_DWLG122       0x3700          /* Wireless DWLG122-b1 */
-#define        USB_PRODUCT_DLINK2_DWLG122C1    0x3c03          /* DWL-G122 rev C1 */
-#define        USB_PRODUCT_DLINK2_WUA1340      0x3c04          /* WUA-1340 */
+#define        USB_PRODUCT_DLINK_DWL120E       0x3200          /* DWL-120 rev E */
+#define        USB_PRODUCT_DLINK_DWL122        0x3700          /* DWL-122 */
+#define        USB_PRODUCT_DLINK_DWLG120       0x3701          /* DWL-G120 */
+#define        USB_PRODUCT_DLINK_DWL120F       0x3702          /* DWL-120 rev F */
+#define        USB_PRODUCT_DLINK_DWLAG132      0x3a00          /* DWL-AG132 */
+#define        USB_PRODUCT_DLINK_DWLAG132_NF   0x3a01          /* DWL-AG132 (no firmware) */
+#define        USB_PRODUCT_DLINK_DWLG132       0x3a02          /* DWL-G132 */
+#define        USB_PRODUCT_DLINK_DWLG132_NF    0x3a03          /* DWL-G132 (no firmware) */
+#define        USB_PRODUCT_DLINK_DWLAG122      0x3a04          /* DWL-AG122 */
+#define        USB_PRODUCT_DLINK_DWLAG122_NF   0x3a05          /* DWL-AG122 (no firmware) */
+#define        USB_PRODUCT_DLINK_DWLG122       0x3c00          /* DWL-G122 b1 wireless adapter */
+#define        USB_PRODUCT_DLINK_DUBE100B1     0x3c05          /* DUB-E100 rev B1 */
 #define        USB_PRODUCT_DLINK_DSB650C       0x4000          /* 10Mbps ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX1     0x4001          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX      0x4002          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650TX2     0x4102          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_DLINK_DSB650        0xabc1          /* 10/100 ethernet adapter */
 
+#define        USB_PRODUCT_DLINK2_DWLG122C1    0x3c03          /* DWL-G122 rev C1 */
+#define        USB_PRODUCT_DLINK2_WUA1340      0x3c04          /* WUA-1340 */
+
 /* eGalax Products */
 #define        USB_PRODUCT_EGALAX_TPANEL       0x0001          /* Touch Panel */
 #define        USB_PRODUCT_EGALAX_TPANEL2      0x0002          /* Touch Panel */
 
 /* Eicon Networks */
 #define        USB_PRODUCT_EICON_DIVA852       0x4905          /* Diva 852 ISDN TA */
+#define        USB_PRODUCT_DMI_CFSM_RW 0xa109          /* CF/SM Reader/Writer */
 
 /* EIZO products */
 #define        USB_PRODUCT_EIZO_HUB    0x0000          /* hub */
 #define        USB_PRODUCT_EIZO_MONITOR        0x0001          /* monitor */
 
+/* ELCON Systemtechnik products */
+#define        USB_PRODUCT_ELCON_PLAN  0x0002          /* Goldpfeil P-LAN */
+
 /* Elecom products */
 #define        USB_PRODUCT_ELECOM_MOUSE29UO    0x0002          /* mouse 29UO */
 #define        USB_PRODUCT_ELECOM_LDUSBTX0     0x200c          /* LD-USB/TX */
 #define        USB_PRODUCT_ELECOM_LDUSBTX1     0x4002          /* LD-USB/TX */
 #define        USB_PRODUCT_ELECOM_LDUSBLTX     0x4005          /* LD-USBL/TX */
 #define        USB_PRODUCT_ELECOM_LDUSBTX2     0x400b          /* LD-USB/TX */
+#define        USB_PRODUCT_ELECOM_LDUSB20      0x4010          /* LD-USB20 */
 #define        USB_PRODUCT_ELECOM_UCSGT        0x5003          /* UC-SGT serial adapter */
 #define        USB_PRODUCT_ELECOM_UCSGT0       0x5004          /* UC-SGT0 Serial */
 #define        USB_PRODUCT_ELECOM_LDUSBTX3     0xabc1          /* LD-USB/TX */
 #define        USB_PRODUCT_EPSON_1260  0x011d          /* Perfection 1260 scanner */
 #define        USB_PRODUCT_EPSON_1660  0x011e          /* Perfection 1660 scanner */
 #define        USB_PRODUCT_EPSON_1670  0x011f          /* Perfection 1670 scanner */
+#define        USB_PRODUCT_EPSON_1270  0x0120          /* Perfection 1270 scanner */
+#define        USB_PRODUCT_EPSON_2480  0x0121          /* Perfection 2480 scanner */
+#define        USB_PRODUCT_EPSON_3590  0x0122          /* Perfection 3590 scanner */
+#define        USB_PRODUCT_EPSON_4990  0x012a          /* Perfection 4990 Photo scanner */
+#define        USB_PRODUCT_EPSON_STYLUS_875DC  0x0601          /* Stylus Photo 875DC Card Reader */
+#define        USB_PRODUCT_EPSON_STYLUS_895    0x0602          /* Stylus Photo 895 Card Reader */
+#define        USB_PRODUCT_EPSON_3500  0x080e          /* CX-3500/3600/3650 MFP */
+#define        USB_PRODUCT_EPSON_RX425 0x080f          /* Stylus Photo RX425 scanner */
+#define        USB_PRODUCT_EPSON_4200  0x0820          /* CX4200 MP scanner */
 
 /* e-TEK Labs products */
 #define        USB_PRODUCT_ETEK_1COM   0x8007          /* Serial port */
 /* Griffin Technology */
 #define        USB_PRODUCT_GRIFFIN_IMATE       0x0405          /* iMate, ADB adapter */
 
+/* FEIYA products */
+#define        USB_PRODUCT_FEIYA_5IN1  0x1132          /* 5-in-1 Card Reader */
+
+/* Fossil, Inc products */
+#define        USB_PRODUCT_FOSSIL_WRISTPDA     0x0002          /* Wrist PDA */
+
 /* Freecom products */
 #define        USB_PRODUCT_FREECOM_DVD 0xfc01          /* Connector for DVD drive */
 
 /* Future Technology Devices products */
 #define        USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001          /* 8U232AM Serial converter */
+#define        USB_PRODUCT_FTDI_SERIAL_2232C   0x6010          /* FT2232C Dual port Serial */
 #define        USB_PRODUCT_FTDI_PS2KBDMS       0x8371          /* PS/2 Keyboard/Mouse */
 #define        USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372          /* 8U100AX Serial converter */
-#define        USB_PRODUCT_FTDI_LCD_MX200_USB  0xfa01          /* Matrix Orbital MX200 Series LCD */
+/* Gude Analog- und Digitalsysteme products also use FTDI's id: */
+#define        USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M   0xcc48          /* OpenPort 1.3 Mitsubishi */
+#define        USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S   0xcc49          /* OpenPort 1.3 Subaru */
+#define        USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U   0xcc4a          /* OpenPort 1.3 Universal */
+#define        USB_PRODUCT_FTDI_EISCOU 0xe888          /* Expert ISDN Control USB */
+#define        USB_PRODUCT_FTDI_UOPTBR 0xe889          /* USB-RS232 OptoBridge */
+#define        USB_PRODUCT_FTDI_EMCU2D 0xe88a          /* Expert mouseCLOCK USB II */
+#define        USB_PRODUCT_FTDI_PCMSFU 0xe88b          /* Precision Clock MSF USB */
+#define        USB_PRODUCT_FTDI_EMCU2H 0xe88c          /* Expert mouseCLOCK USB II HBG */
+#define        USB_PRODUCT_FTDI_USBSERIAL      0xfa00          /* Matrix Orbital USB Serial */
+#define        USB_PRODUCT_FTDI_MX2_3  0xfa01          /* Matrix Orbital MX2 or MX3 LCD */
+#define        USB_PRODUCT_FTDI_MX4_5  0xfa02          /* Matrix Orbital MX4 or MX5 LCD */
 #define        USB_PRODUCT_FTDI_LCD_LK202_24_USB       0xfa03          /* Matrix Orbital LK202-24 LCD */
 #define        USB_PRODUCT_FTDI_LCD_LK204_24   0xfa04          /* Matrix Orbital LK204-24 LCD */
 #define        USB_PRODUCT_FTDI_LCD_CFA_632    0xfc08          /* Crystalfontz CFA-632 LCD */
 #define        USB_PRODUCT_FTDI_LCD_CFA_634    0xfc09          /* Crystalfontz CFA-634 LCD */
 #define        USB_PRODUCT_FTDI_LCD_CFA_633    0xfc0b          /* Crystalfontz CFA-633 LCD */
 #define        USB_PRODUCT_FTDI_CFA_631        0xfc0c          /* Crystalfontz CFA-631 LCD */
+#define        USB_PRODUCT_FTDI_CFA_635        0xfc0d          /* Crystalfontz CFA-635 USB LCD */
 #define        USB_PRODUCT_FTDI_SEMC_DSS20     0xfc82          /* SEMC DSS-20 SyncStation */
 
 /* Fuji photo products */
 /* Fujitsu protducts */
 #define        USB_PRODUCT_FUJITSU_AH_F401U    0x105b          /* AH-F401U Air H device */
 
+/* Garmin products */
+#define        USB_PRODUCT_GARMIN_IQUE_3600    0x0004          /* iQue 3600 */
+
 /* General Instruments (Motorola) products */
 #define        USB_PRODUCT_GENERALINSTMNTS_SB5100      0x5100          /* SURFboard SB5100 Cable modem */
 
 /* Genesys Logic products */
+#define        USB_PRODUCT_GENESYS_GL620USB    0x0501          /* GL620USB Host-Host interface */
 #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 Card Reader */
 #define        USB_PRODUCT_GENESYS_GL641USB2IDE_2      0x0701          /* GL641USB USB-IDE Bridge */
 #define        USB_PRODUCT_GENESYS_GL641USB2IDE        0x0702          /* GL641USB USB-IDE Bridge */
+#define        USB_PRODUCT_GENESYS_GL641USB_2  0x0760          /* GL641USB 6-in-1 Card Reader */
 
 /* GIGABYTE products */
+#define        USB_PRODUCT_GIGABYTE_GN54G      0x8001          /* GN-54G */
+#define        USB_PRODUCT_GIGABYTE_GNBR402W   0x8002          /* GN-BR402W */
+#define        USB_PRODUCT_GIGABYTE_GNWLBM101  0x8003          /* GN-WLBM101 */
 #define        USB_PRODUCT_GIGABYTE_GNWBKG     0x8007          /* GN-WBKG */
 #define        USB_PRODUCT_GIGABYTE_GNWB01GS   0x8008          /* GN-WB01GS */
 #define        USB_PRODUCT_GIGABYTE_GNWI05GS   0x800a          /* GN-WI05GS */
 
 /* Gigaset products */
+#define        USB_PRODUCT_GIGASET_WLAN        0x0701          /* WLAN */
+#define        USB_PRODUCT_GIGASET_SMCWUSBTG   0x0710          /* SMCWUSBT-G */
+#define        USB_PRODUCT_GIGASET_SMCWUSBTG_NF        0x0711          /* SMCWUSBT-G (no firmware) */
+#define        USB_PRODUCT_GIGASET_AR5523      0x0712          /* AR5523 */
+#define        USB_PRODUCT_GIGASET_AR5523_NF   0x0713          /* AR5523 (no firmware) */
 #define        USB_PRODUCT_GIGASET_RT2573      0x0722          /* RT2573 */
 
+/* Global Sun Technology product */
+#define        USB_PRODUCT_GLOBALSUN_AR5523_1  0x7801          /* AR5523 */
+#define        USB_PRODUCT_GLOBALSUN_AR5523_1_NF       0x7802          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_GLOBALSUN_AR5523_2  0x7811          /* AR5523 */
+#define        USB_PRODUCT_GLOBALSUN_AR5523_2_NF       0x7812          /* AR5523 (no firmware) */
+
+/* G.Mate, Inc products */
+#define        USB_PRODUCT_GMATE_YP3X00        0x1001          /* YP3X00 PDA */
+
 /* GoHubs products */
 #define        USB_PRODUCT_GOHUBS_GOCOM232     0x1001          /* GoCOM232 Serial converter */
 
 /* Good Way Technology products */
+#define        USB_PRODUCT_GOODWAY_GWUSB2E     0x6200          /* GWUSB2E */
 #define        USB_PRODUCT_GOODWAY_RT2573      0xc019          /* RT2573 */
 
 /* Gravis products */
 #define        USB_PRODUCT_HP_5300C    0x0701          /* Scanjet 5300C */
 #define        USB_PRODUCT_HP_4400C    0x0705          /* Scanjet 4400C */
 #define        USB_PRODUCT_HP_816C     0x0804          /* DeskJet 816C */
+#define        USB_PRODUCT_HP_82x0C    0x0b01          /* Scanjet 82x0C */
 #define        USB_PRODUCT_HP_2300D    0x0b17          /* Laserjet 2300d */
 #define        USB_PRODUCT_HP_970CSE   0x1004          /* Deskjet 970Cse */
 #define        USB_PRODUCT_HP_5400C    0x1005          /* Scanjet 5400C */
 #define        USB_PRODUCT_HP_6127     0x3504          /* Deskjet 6127 */
 #define        USB_PRODUCT_HP_HN210E   0x811c          /* Ethernet HN210E */
 
-/* HP products */
 #define        USB_PRODUCT_HP2_C500    0x6002          /* PhotoSmart C500 */
 
 /* HUAWEI products */
 #define        USB_PRODUCT_HUAWEI3COM_RT2573   0x0009          /* RT2573 */
+#define        USB_PRODUCT_HUAWEI_MOBILE       0x1001          /* Huawei Mobile */
 
 /* IBM Corporation */
 #define        USB_PRODUCT_IBM_OPTTRAVELMOUSE  0x3107          /* Optical */
 /* Iiyama products */
 #define        USB_PRODUCT_IIYAMA_HUB  0x0201          /* Hub */
 
+/* Imagination Technologies products */
+#define        USB_PRODUCT_IMAGINATION_DBX1    0x2107          /* DBX1 DSP core */
+
 /* Imation */
 #define        USB_PRODUCT_IMATION_FLASHGO     0xb000          /* Flash Go! */
 
 #define        USB_PRODUCT_IODATA_USBETT       0x0901          /* USB ETT */
 #define        USB_PRODUCT_IODATA_USBETTX      0x0904          /* USB ETTX */
 #define        USB_PRODUCT_IODATA_USBETTXS     0x0913          /* USB ETTX */
+#define        USB_PRODUCT_IODATA_USBWNB11A    0x0919          /* USB WN-B11 */
 #define        USB_PRODUCT_IODATA_USBWNB11     0x0922          /* USB Airport WN-B11 */
+#define        USB_PRODUCT_IODATA_ETGUS2       0x0930          /* ETG-US2 */
 #define        USB_PRODUCT_IODATA_USBRSAQ      0x0a03          /* USB serial adapter USB-RSAQ1 */
 #define        USB_PRODUCT_IODATA2_USB2SC      0x0a09          /* USB2.0-SCSI Bridge USB2-SC */
 
 #define        USB_PRODUCT_IRIVER_IFP_3XX      0x1103          /* iFP-3xx */
 #define        USB_PRODUCT_IRIVER_IFP_5XX      0x1105          /* iFP-5xx */
 
+/* Ituner networks products */
+#define        USB_PRODUCT_ITUNERNET_USBLCD2X20        0x0002          /* USB-LCD 2x20 */
+
 /* Jaton products */
 #define        USB_PRODUCT_JATON_EDA   0x5704          /* Ethernet Device Adapter */
 
 #define        USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA     0x5002          /* VideoCAM VGA */
 
 /* Keyspan products */
-#define        USB_PRODUCT_KEYSPAN_USA18       0x0111          /* USA-18 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA28_NF    0x0101          /* USA-28 serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA28X_NF   0x0102          /* USA-28X serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA19_NF    0x0103          /* USA-19 serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA18_NF    0x0104          /* USA-18 serial adapter (no firmware) */
-#define        USB_PRODUCT_KEYSPAN_USA18X      0x0112          /* USA-18X serial adapter */
-#define        USB_PRODUCT_KEYSPAN_USA18X_NF   0x0105          /* USA-18X serial adapter */
-#define        USB_PRODUCT_KEYSPAN_USA19W_NF   0x0106          /* USA-19W serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18X_NF   0x0105          /* USA-18X serial adapter (no firmware) */
+#define        USB_PRODUCT_KEYSPAN_USA19W_NF   0x0106          /* USA-19W serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA19       0x0107          /* USA-19 serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19W      0x0108          /* USA-19W serial adapter */
-#define        USB_PRODUCT_KEYSPAN_USA49W_NF   0x0109          /* USA-49W serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA49W_NF   0x0109          /* USA-49W serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA49W      0x010a          /* USA-49W serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19QI_NF  0x010b          /* USA-19QI serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA19QI     0x010c          /* USA-19QI serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA19Q_NF   0x010d          /* USA-19Q serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA19Q      0x010e          /* USA-19Q serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA28       0x010f          /* USA-28 serial adapter */
-#define        USB_PRODUCT_KEYSPAN_USA28X      0x0102          /* USA-28X serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA28XXB    0x0110          /* USA-28X/XB serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18       0x0111          /* USA-18 serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA18X      0x0112          /* USA-18X serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA28XB_NF  0x0113          /* USA-28XB serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA28XA_NF  0x0114          /* USA-28XB serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA28XA     0x0115          /* USA-28XA serial adapter */
 #define        USB_PRODUCT_KEYSPAN_USA18XA_NF  0x0116          /* USA-18XA serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA18XA     0x0117          /* USA-18XA serial adapter */
-#define        USB_PRODUCT_KEYSPAN_USA19QW_NF  0x0118          /* USA-19QW serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19QW_NF  0x0118          /* USA-19QW serial adapter (no firmware) */
 #define        USB_PRODUCT_KEYSPAN_USA19QW     0x0119          /* USA-19WQ serial adapter */
+#define        USB_PRODUCT_KEYSPAN_USA19HS     0x0121          /* USA-19HS serial adapter */
 #define        USB_PRODUCT_KEYSPAN_UIA10       0x0201          /* UIA-10 remote control */
 #define        USB_PRODUCT_KEYSPAN_UIA11       0x0202          /* UIA-11 remote control */
 
 #define        USB_PRODUCT_KYE_VIVIDPRO        0x2001          /* ColorPage Vivid-Pro scanner */
 
 /* Kyocera products */
+#define        USB_PRODUCT_KYOCERA_FINECAM_S3X 0x0100          /* Finecam S3x */
+#define        USB_PRODUCT_KYOCERA_FINECAM_S4  0x0101          /* Finecam S4 */
+#define        USB_PRODUCT_KYOCERA_FINECAM_S5  0x0103          /* Finecam S5 */
+#define        USB_PRODUCT_KYOCERA_FINECAM_L3  0x0105          /* Finecam L3 */
 #define        USB_PRODUCT_KYOCERA_AHK3001V    0x0203          /* AH-K3001V */
+#define        USB_PRODUCT_KYOCERA2_CDMA_MSM_K 0x17da          /* Qualcomm Kyocera CDMA Technologies MSM */
 
 /* LaCie products */
 #define        USB_PRODUCT_LACIE_HD    0xa601          /* Hard Disk */
 /* Lexar products */
 #define        USB_PRODUCT_LEXAR_JUMPSHOT      0x0001          /* jumpSHOT CompactFlash Reader */
 #define        USB_PRODUCT_LEXAR_2662WAR       0xa002          /* 2662W-AR */
+#define        USB_PRODUCT_LEXAR_CF_READER     0xb002          /* USB CF Reader */
 #define        USB_PRODUCT_LEXAR_MCR   0xb018          /* Multi-Card Reader */
 
 /* Lexmark products */
 #define        USB_PRODUCT_LOGITECH_USBPS2MOUSE        0xc00e          /* USB-PS/2 Optical Mouse */
 #define        USB_PRODUCT_LOGITECH_MUV55A     0xc016          /* M-UV55a */
 #define        USB_PRODUCT_LOGITECH_UN58A      0xc030          /* iFeel Mouse */
+#define        USB_PRODUCT_LOGITECH_UN53B      0xc032          /* iFeel MouseMan */
 #define        USB_PRODUCT_LOGITECH_WMPAD      0xc208          /* WingMan GamePad Extreme */
 #define        USB_PRODUCT_LOGITECH_WMRPAD     0xc20a          /* WingMan RumblePad */
 #define        USB_PRODUCT_LOGITECH_WMJOY      0xc281          /* WingMan Force joystick */
 /* Macally products */
 #define        USB_PRODUCT_MACALLY_MOUSE1      0x0101          /* mouse */
 
-/* Matrix Orbital products */
-#define        USB_PRODUCT_FTDI_USBSERIAL      0xfa00          /* Matrix Orbital USB Serial */
-#define        USB_PRODUCT_FTDI_MX2_3  0xfa01          /* Matrix Orbital MX2 or MX3 */
-#define        USB_PRODUCT_FTDI_MX4_5  0xfa02          /* Matrix Orbital MX4 or MX5 */
-#define        USB_PRODUCT_FTDI_LK202  0xfa03          /* Matrix Orbital VK/LK202 Family */
-#define        USB_PRODUCT_FTDI_LK204  0xfa04          /* Matrix Orbital VK/LK204 Family */
-
 /* MCT Corp. products */
 #define        USB_PRODUCT_MCT_HUB0100 0x0100          /* Hub */
 #define        USB_PRODUCT_MCT_DU_H3SP_USB232  0x0200          /* D-Link DU-H3SP USB BAY Hub */
 #define        USB_PRODUCT_MELCO_KG54  0x0066          /* WLI-U2-KG54 WLAN */
 #define        USB_PRODUCT_MELCO_KG54AI        0x0067          /* WLI-U2-KG54-AI WLAN */
 #define        USB_PRODUCT_MELCO_NINWIFI       0x008b          /* Nintendo Wi-Fi */
+#define        USB_PRODUCT_MELCO_PCOPRS1       0x00b3          /* PC-OP-RS1 RemoteStation */
 #define        USB_PRODUCT_MELCO_SG54HP        0x00d8          /* WLI-U2-SG54HP */
 #define        USB_PRODUCT_MELCO_G54HP 0x00d9          /* WLI-U2-G54HP */
 
+/* MetaGeek products */
+#define        USB_PRODUCT_METAGEEK_WISPYX     0x083e          /* MetaGeek Wi-Spy 2.4x */
+
 /* Metricom products */
 #define        USB_PRODUCT_METRICOM_RICOCHET_GS        0x0001          /* Ricochet GS */
 
+/* MGE UPS Systems */
 #define        USB_PRODUCT_MGE_UPS1    0x0001          /* MGE UPS SYSTEMS PROTECTIONCENTER 1 */
 #define        USB_PRODUCT_MGE_UPS2    0xffff          /* MGE UPS SYSTEMS PROTECTIONCENTER 2 */
 
 #define        USB_PRODUCT_MSI_RT2570  0x6861          /* RT2570 */
 #define        USB_PRODUCT_MSI_RT2570_2        0x6865          /* RT2570 */
 #define        USB_PRODUCT_MSI_RT2570_3        0x6869          /* RT2570 */
-#define        USB_PRODUCT_MSI_RT2573  0x6877          /* RT2573 */
 #define        USB_PRODUCT_MSI_RT2573_1        0x6874          /* RT2573 */
-#define        USB_PRODUCT_MSI_RT2573_2        0xa861          /* RT2573 */
-#define        USB_PRODUCT_MSI_RT2573_3        0xa874          /* RT2573 */
+#define        USB_PRODUCT_MSI_RT2573_2        0x6877          /* RT2573 */
+#define        USB_PRODUCT_MSI_RT2573_3        0xa861          /* RT2573 */
+#define        USB_PRODUCT_MSI_RT2573_4        0xa874          /* RT2573 */
 
+/* Microdia products */
+#define        USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d          /* TwinkleCam USB camera */
 /* Micronet Communications products */
 #define        USB_PRODUCT_MICRONET_SP128AR    0x0003          /* SP128AR EtherFast */
 
 #define        USB_PRODUCT_MICROSOFT_INETPRO2  0x002b          /* Internet Keyboard Pro */
 #define        USB_PRODUCT_MICROSOFT_MN510     0x006e          /* MN510 Wireless */
 #define        USB_PRODUCT_MICROSOFT_MN110     0x007a          /* 10/100 USB NIC */
+#define        USB_PRODUCT_MICROSOFT_WLINTELLIMOUSE    0x008c          /* Wireless Optical IntelliMouse */
+#define        USB_PRODUCT_MICROSOFT_WLNOTEBOOK        0x00b9          /* Wireless Optical Mouse (Model 1023) */
+#define        USB_PRODUCT_MICROSOFT_WLNOTEBOOK2       0x00e1          /* Wireless Optical Mouse 3000 (Model 1056) */
+#define        USB_PRODUCT_MICROSOFT_WLUSBMOUSE        0x00b9          /* Wireless USB Mouse */
+#define        USB_PRODUCT_MICROSOFT_XBOX360   0x0292          /* XBOX 360 WLAN */
 
 /* Microtech products */
 #define        USB_PRODUCT_MICROTECH_SCSIDB25  0x0004          /* USB-SCSI-DB25 */
 #define        USB_PRODUCT_MINOLTA_X   0x4009          /* Dimage X */
 #define        USB_PRODUCT_MINOLTA_DIMAGE7I    0x400b          /* Dimage 7i */
 #define        USB_PRODUCT_MINOLTA_5400        0x400e          /* Dimage 5400 */
-#define        USB_PRODUCT_MINOLTA_DIMAGEA1    0x401a          /* Dimage A1 */
+#define        USB_PRODUCT_MINOLTA_F300        0x4011          /* Dimage F300 */
 #define        USB_PRODUCT_MINOLTA_XT  0x4015          /* Dimage Xt */
+#define        USB_PRODUCT_MINOLTA_E223        0x4017          /* Dimage E223 */
+#define        USB_PRODUCT_MINOLTA_DIMAGEA1    0x401a          /* Dimage A1 */
 
 /* Mitsumi products */
 #define        USB_PRODUCT_MITSUMI_CDRRW       0x0000          /* CD-R/RW Drive */
 
 /* Mobility products */
 #define        USB_PRODUCT_MOBILITY_EA 0x0204          /* Ethernet Adapter */
+#define        USB_PRODUCT_MOBILITY_EASIDOCK   0x0304          /* EasiDock Ethernet */
+
+/* MosChip products */
+#define        USB_PRODUCT_MOSCHIP_MCS7703     0x7703          /* MCS7703 Serial Port Adapter */
+#define        USB_PRODUCT_MOSCHIP_MCS7830     0x7830          /* MCS7830 Ethernet */
 
 /* Motorola products */
 #define        USB_PRODUCT_MOTOROLA_MC141555   0x1555          /* MC141555 hub controller */
 #define        USB_PRODUCT_MOTOROLA_SB4100     0x4100          /* SB4100 USB Cable Modem */
+
 #define        USB_PRODUCT_MOTOROLA2_T720C     0x2822          /* T720c */
+#define        USB_PRODUCT_MOTOROLA2_A41XV32X  0x2a22          /* A41x/V32x Mobile Phones */
 #define        USB_PRODUCT_MOTOROLA2_A920      0x4002          /* A920 */
+#define        USB_PRODUCT_MOTOROLA2_E398      0x4810          /* E398 Mobile Phone */
+#define        USB_PRODUCT_MOTOROLA2_USBLAN    0x600c          /* USBLAN */
+#define        USB_PRODUCT_MOTOROLA2_USBLAN2   0x6027          /* USBLAN */
 
 /* Micro Star International products */
 #define        USB_PRODUCT_MSI_BT_DONGLE       0x1967          /* Bluetooth USB dongle */
 #define        USB_PRODUCT_MSYSTEMS_DISKONKEY  0x0010          /* DiskOnKey */
 #define        USB_PRODUCT_MSYSTEMS_DISKONKEY2 0x0011          /* DiskOnKey */
 
+/* Myson products */
+#define        USB_PRODUCT_MYSON_HEDEN 0x8818          /* USB-IDE */
+
 /* National Instruments */
 #define        USB_PRODUCT_NI_GPIB_USB_A       0xc920          /* GPIB-USB-A */
 
 #define        USB_PRODUCT_NEODIO_ND3260       0x3260          /* 8-in-1 Multi-format Flash Controller */
 #define        USB_PRODUCT_NEODIO_ND5010       0x5010          /* Multi-format Flash Controller */
 
+/* Netac products */
+#define        USB_PRODUCT_NETAC_CF_CARD       0x1060          /* USB-CF-Card */
+
 /* NetChip Technology Products */
 #define        USB_PRODUCT_NETCHIP_TURBOCONNECT        0x1080          /* Turbo-Connect */
 #define        USB_PRODUCT_NETCHIP_CLIK40      0xa140          /* Clik! 40 */
+#define        USB_PRODUCT_NETCHIP_ETHERNETGADGET      0xa4a2          /* Linux Ethernet/RNDIS gadget on pxa210/25x/26x */
 
 /* Netgear products */
 #define        USB_PRODUCT_NETGEAR_EA101       0x1001          /* Ethernet adapter */
 #define        USB_PRODUCT_NETGEAR_EA101X      0x1002          /* Ethernet adapter */
 #define        USB_PRODUCT_NETGEAR_FA101       0x1020          /* 10/100 Ethernet */
 #define        USB_PRODUCT_NETGEAR_FA120       0x1040          /* USB 2.0 Fast Ethernet Adapter */
+#define        USB_PRODUCT_NETGEAR_WG111U      0x4300          /* WG111U */
+#define        USB_PRODUCT_NETGEAR_WG111U_NF   0x4301          /* WG111U (no firmware) */
 #define        USB_PRODUCT_NETGEAR_MA111NA     0x4110          /* 802.11b Adapter */
 #define        USB_PRODUCT_NETGEAR_XA601       0x8100          /* USB to PL Adapter */
 
 #define        USB_PRODUCT_NETGEAR2_MA101      0x4100          /* MA101 */
 #define        USB_PRODUCT_NETGEAR2_MA101B     0x4102          /* MA101 Rev B */
 
+#define        USB_PRODUCT_NETGEAR3_WG111T     0x4250          /* WG111T */
+#define        USB_PRODUCT_NETGEAR3_WG111T_NF  0x4251          /* WG111T (no firmware) */
+#define        USB_PRODUCT_NETGEAR3_WPN111     0x5f00          /* WPN111 */
+#define        USB_PRODUCT_NETGEAR3_WPN111_NF  0x5f01          /* WPN111 (no firmware) */
+
 /* Nikon products */
 #define        USB_PRODUCT_NIKON_E990  0x0102          /* Digital Camera E990 */
 #define        USB_PRODUCT_NIKON_E880  0x0103          /* Digital Camera E880 */
 #define        USB_PRODUCT_NOVATECH_NV902W     0x9020          /* NV-902W */
 #define        USB_PRODUCT_NOVATECH_RT2573     0x9021          /* RT2573 */
 
+/* Novatel Wireless products */
+#define        USB_PRODUCT_NOVATEL_CDMA_MODEM  0x1110          /* Novatel Wireless Merlin CDMA */
+#define        USB_PRODUCT_NOVATEL_U740        0x1400          /* Merlin U740 */
+#define        USB_PRODUCT_NOVATEL2_FLEXPACKGPS        0x0100          /* NovAtel FlexPack GPS receiver */
+
 /* Olympus products */
 #define        USB_PRODUCT_OLYMPUS_C1  0x0102          /* C-1 Digital Camera */
 #define        USB_PRODUCT_OLYMPUS_C700        0x0105          /* C-700 Ultra Zoom */
 #define        USB_PRODUCT_ONSPEC_MD1II        0xb006          /* Datafab MD1-II PC-Card Reader */
 
 #define        USB_PRODUCT_ONSPEC2_8IN2        0xb012          /* 8In2 */
+#define        USB_PRODUCT_ONSPEC2_IMAGEMATE_SDDR55    0xa103          /* ImageMate SDDR55 */
 
 /* Ours Technology Inc. */
 #define        USB_PRODUCT_OTI_SOLID   0x6803          /* Solid state disk */
 #define        USB_PRODUCT_OTI_FLASHDISK       0x6828          /* Flash Disk 128M */
 
+/* Option products */
+#define        USB_PRODUCT_OPTION_VODAFONEMC3G 0x5000          /* Vodafone Mobile Connect 3G datacard */
+#define        USB_PRODUCT_OPTION_GT3G 0x6000          /* GlobeTrotter 3G datacard */
+#define        USB_PRODUCT_OPTION_GT3GQUAD     0x6300          /* GlobeTrotter 3G QUAD datacard */
+#define        USB_PRODUCT_OPTION_GT3GPLUS     0x6600          /* GlobeTrotter 3G+ datacard */
+
+/* OQO */
+#define        USB_PRODUCT_OQO_WIFI01  0x0002          /* model 01 WiFi interface */
+#define        USB_PRODUCT_OQO_BT01    0x0003          /* model 01 Bluetooth interface */
+#define        USB_PRODUCT_OQO_ETHER01PLUS     0x7720          /* model 01+ Ethernet */
+#define        USB_PRODUCT_OQO_ETHER01 0x8150          /* model 01 Ethernet interface */
+
 /* Palm Computing, Inc. product */
 #define        USB_PRODUCT_PALM_SERIAL 0x0080          /* USB Serial Adaptor */
 #define        USB_PRODUCT_PALM_M500   0x0001          /* Palm m500 */
 
 /* Panasonic products */
 #define        USB_PRODUCT_PANASONIC_LS120     0x0901          /* LS-120 Camera */
+#define        USB_PRODUCT_PANASONIC_KXL840AN  0x0d01          /* CD-R Drive KXL-840AN */
 #define        USB_PRODUCT_PANASONIC_KXLRW32AN 0x0d09          /* CD-R Drive KXL-RW32AN */
 #define        USB_PRODUCT_PANASONIC_KXLCB20AN 0x0d0a          /* CD-R Drive KXL-CB20AN */
 #define        USB_PRODUCT_PANASONIC_KXLCB35AN 0x0d0e          /* DVD-ROM & CD-R/RW */
 #define        USB_PRODUCT_PEN_MOBILEDRIVE     0x0280          /* USB 3 in 1 Card Reader/Writer */
 #define        USB_PRODUCT_PEN_USBDISK 0x0d7d          /* USB Disk */
 #define        USB_PRODUCT_PEN_ATTACHE 0x1300          /* USB 2.0 Flash Drive */
+#define        USB_PRODUCT_ADDON_A256MB        0x1400          /* Attache 256MB USB 2.0 Flash Drive */
+#define        USB_PRODUCT_ADDON_DISKPRO512    0x1420          /* USB 2.0 Flash Drive (DANE-ELEC zMate 512MB USB flash drive) */
 
 /* Peracom products */
 #define        USB_PRODUCT_PERACOM_SERIAL1     0x0001          /* Serial Converter */
 
 /* Planex Communications products */
 #define        USB_PRODUCT_PLANEX_GW_US11H     0x14ea          /* GW-US11H WLAN */
+
+#define        USB_PRODUCT_PLANEX2_GW_US11S    0x3220          /* GW-US11S WLAN */
 #define        USB_PRODUCT_PLANEX2_GWUS54HP    0xab01          /* GW-US54HP */
 #define        USB_PRODUCT_PLANEX2_GWUSMM      0xed02          /* GW-USMM */
 #define        USB_PRODUCT_PLANEX2_GWUS54MINI2 0xab50          /* GW-US54Mini2 */
+#define        USB_PRODUCT_PLANEX2_GWUS54SG    0xc002          /* GW-US54SG */
+#define        USB_PRODUCT_PLANEX2_GWUS54GZL   0xc007          /* GW-US54GZL */
+
+#define        USB_PRODUCT_PLANEX3_GU1000T     0xab11          /* GU-1000T */
+#define        USB_PRODUCT_PLANEX3_GWUS54MINI  0xab13          /* GW-US54Mini */
 
 /* Plantronics products */
 #define        USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1          /* Platronics DSP-400 Headset */
 #define        USB_PRODUCT_QTRONIX_980N        0x2011          /* Scorpion-980N keyboard */
 
 /* Qualcomm products */
-/* ??? XXX product QUALCOMM CDMA_MSM   0x6000  CDMA Technologies MSM phone */
 #define        USB_PRODUCT_QUALCOMM_CDMA_MSM   0x3196          /* CDMA Technologies MSM modem */
+#define        USB_PRODUCT_QUALCOMM_CDMA_MSM_2 0x6000          /* CDMA Technologies MSM phone */
+
+#define        USB_PRODUCT_QUALCOMM2_RWT_FCT   0x3100          /* RWT FCT-CDMA 2000 1xRTT modem */
 #define        USB_PRODUCT_QUALCOMM2_CDMA_MSM  0x6000          /* CDMA Technologies MSM phone */
 
 /* Quickshot products */
 /* RATOC Systems products */
 #define        USB_PRODUCT_RATOC_REXUSB60      0xb000          /* USB serial adapter REX-USB60 */
 
+/* Sagem products */
+#define        USB_PRODUCT_SAGEM_USBSERIAL     0x0027          /* USB-Serial Controller */
+
 /* Saitek products */
 #define        USB_PRODUCT_SAITEK_CYBORG_3D_GOLD       0x0006          /* Cyborg 3D Gold Joystick */
 
 /* Samsung products */
 #define        USB_PRODUCT_SAMSUNG_ML6060      0x3008          /* ML-6060 laser printer */
+#define        USB_PRODUCT_SAMSUNG_YP_U2       0x5050          /* YP-U2 MP3 Player */
+#define        USB_PRODUCT_SAMSUNG_I500        0x6601          /* I500 Palm USB Phone */
+
+/* Samsung Techwin products */
+#define        USB_PRODUCT_SAMSUNG_TECHWIN_DIGIMAX_410 0x000a          /* Digimax 410 */
 
 /* SanDisk products */
 #define        USB_PRODUCT_SANDISK_SDDR05A     0x0001          /* ImageMate SDDR-05a */
 #define        USB_PRODUCT_SANDISK_SDDR86      0x0621          /* ImageMate SDDR-86 */
 #define        USB_PRODUCT_SANDISK_SDDR75      0x0810          /* ImageMate SDDR-75 */
 #define        USB_PRODUCT_SANDISK_SDCZ2_256   0x7104          /* Cruzer Mini 256MB */
+#define        USB_PRODUCT_SANDISK_SDCZ4_128   0x7112          /* Cruzer Micro 128MB */
+#define        USB_PRODUCT_SANDISK_SDCZ4_256   0x7113          /* Cruzer Micro 256MB */
 
 /* Sanwa Supply products */
 #define        USB_PRODUCT_SANWASUPPLY_JYDV9USB        0x9806          /* JY-DV9USB gamepad */
 #define        USB_PRODUCT_SHARK_PA    0x0400          /* Pocket Adapter */
 
 /* Sharp products */
-#define        USB_PRODUCT_SHARP_SL5500        0x8004          /* SL5500 */
-#define        USB_PRODUCT_SHARP_A300  0x8005          /* A300 */
-#define        USB_PRODUCT_SHARP_SL5600        0x8006          /* SL5600 */
-#define        USB_PRODUCT_SHARP_C700  0x8007          /* C700 */
-#define        USB_PRODUCT_SHARP_C750  0x9031          /* C750 */
+#define        USB_PRODUCT_SHARP_SL5500        0x8004          /* Zaurus SL-5500 PDA */
+#define        USB_PRODUCT_SHARP_SLA300        0x8005          /* Zaurus SL-A300 PDA */
+#define        USB_PRODUCT_SHARP_SL5600        0x8006          /* Zaurus SL-5600 PDA */
+#define        USB_PRODUCT_SHARP_SLC700        0x8007          /* Zaurus SL-C700 PDA */
+#define        USB_PRODUCT_SHARP_SLC750        0x9031          /* Zaurus SL-C750 PDA */
+#define        USB_PRODUCT_SHARP_WZERO3ES      0x9123          /* W-ZERO3 ES Smartphone */
 
 /* Shuttle Technology products */
 #define        USB_PRODUCT_SHUTTLE_EUSB        0x0001          /* E-USB Bridge */
 #define        USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001          /* SpeedStream USB */
 #define        USB_PRODUCT_SIEMENS_SPEEDSTREAM22       0x1022          /* SpeedStream USB 1022 */
 
+#define        USB_PRODUCT_SIEMENS2_WLL013     0x001b          /* WLL013 */
+#define        USB_PRODUCT_SIEMENS2_ES75       0x0034          /* GSM module MC35 */
+#define        USB_PRODUCT_SIEMENS2_WL54G      0x3c06          /* 54g USB Network Adapter */
+
+#define        USB_PRODUCT_SIEMENS3_SX1        0x0001          /* SX1 */
+#define        USB_PRODUCT_SIEMENS3_X65        0x0003          /* X65 */
+#define        USB_PRODUCT_SIEMENS3_X75        0x0004          /* X75 */
+
+/* Sierra Wireless products */
+#define        USB_PRODUCT_SIERRA_AIRCARD580   0x0112          /* Sierra Wireless AirCard 580 */
+#define        USB_PRODUCT_SIERRA_MC5720       0x0218          /* MC5720 Wireless Modem */
+
 /* Sigmatel products */
 #define        USB_PRODUCT_SIGMATEL_IRDA       0x4200          /* IrDA */
 #define        USB_PRODUCT_SIGMATEL_I_BEAD100  0x8008          /* i-Bead 100 MP3 Player */
 #define        USB_PRODUCT_SIIG_MULTICARDREADER        0x0201          /* MULTICARDREADER */
 #define        USB_PRODUCT_SIIG_WINTERREADER   0x0330          /* WINTERREADER Reader */
 
+#define        USB_PRODUCT_SIIG2_USBTOETHER    0x0109          /* USB TO Ethernet */
 #define        USB_PRODUCT_SIIG2_US2308        0x0421          /* Serial */
 
 /* Silicom products */
 #define        USB_PRODUCT_SILICOM_U2E 0x0001          /* U2E */
+#define        USB_PRODUCT_SILICOM_GPE 0x0002          /* Psion Gold Port Ethernet */
 
 /* Silicon Portals Inc. */
 #define        USB_PRODUCT_SILICONPORTALS_YAPPH_NF     0x0200          /* YAP Phone (no firmware) */
 #define        USB_PRODUCT_SITECOM_LN029       0x182d          /* LN029 */
 #define        USB_PRODUCT_SITECOM_CN104       0x2068          /* CN104 serial */
 
+#define        USB_PRODUCT_SITECOM2_WL022      0x182d          /* WL-022 */
+
 /* Sitecom Europe products */
+#define        USB_PRODUCT_SITECOMEU_LN028     0x061c          /* LN-028 */
+#define        USB_PRODUCT_SITECOMEU_WL113     0x9071          /* WL-113 */
+#define        USB_PRODUCT_SITECOMEU_ZD1211B   0x9075          /* ZD1211B */
 #define        USB_PRODUCT_SITECOMEU_WL172     0x90ac          /* WL-172 */
 #define        USB_PRODUCT_SITECOMEU_WL113R2   0x9712          /* WL-113 rev 2 */
 
+/* Skanhex Technology products */
+#define        USB_PRODUCT_SKANHEX_MD_7425     0x410a          /* MD 7425 Camera */
+#define        USB_PRODUCT_SKANHEX_SX_520Z     0x5200          /* SX 520z Camera */
+
 /* SmartBridges products */
 #define        USB_PRODUCT_SMARTBRIDGES_SMARTLINK      0x0001          /* SmartLink USB ethernet adapter */
 #define        USB_PRODUCT_SMARTBRIDGES_SMARTNIC       0x0003          /* smartNIC 2 PnP Adapter */
 #define        USB_PRODUCT_SMC_2102USB 0x0100          /* 10Mbps ethernet adapter */
 #define        USB_PRODUCT_SMC_2202USB 0x0200          /* 10/100 ethernet adapter */
 #define        USB_PRODUCT_SMC_2206USB 0x0201          /* EZ Connect USB Ethernet Adapter */
+#define        USB_PRODUCT_SMC_2862WG  0xee13          /* EZ Connect wireless adapter */
+
 #define        USB_PRODUCT_SMC2_2020HUB        0x2020          /* USB Hub */
+
 #define        USB_PRODUCT_SMC3_2662WUSB       0xa002          /* 2662W-AR Wireless Adapter */
 
 /* SOHOware products */
 #define        USB_PRODUCT_SONY_HANDYCAM       0x002e          /* Handycam */
 #define        USB_PRODUCT_SONY_MSC    0x0032          /* MSC memory stick slot */
 #define        USB_PRODUCT_SONY_CLIE_35        0x0038          /* Sony Clie v3.5 */
+#define        USB_PRODUCT_SONY_PEG_N760C      0x0058          /* PEG N760c Memorystick */
 #define        USB_PRODUCT_SONY_PS2KEYBOARD    0x005c          /* PlayStation2 keyboard */
 #define        USB_PRODUCT_SONY_PS2KEYBOARDHUB 0x005d          /* PlayStation2 keyboard hub */
 #define        USB_PRODUCT_SONY_PS2MOUSE       0x0061          /* PlayStation2 mouse */
 #define        USB_PRODUCT_SONY_CLIE_41_MS     0x0099          /* Sony Clie v4.1 Memory Stick slot */
 #define        USB_PRODUCT_SONY_CLIE_41        0x009a          /* Sony Clie v4.1 */
 #define        USB_PRODUCT_SONY_CLIE_NX60      0x00da          /* Sony Clie nx60 */
+#define        USB_PRODUCT_SONY_CLIE_TH55      0x0144          /* Sony Clie th55 */
 #define        USB_PRODUCT_SONY_CLIE_TJ25      0x0169          /* Sony Clie tj25 */
 
-/* Sphairon Access Systems GmbH product */
-#define        USB_PRODUCT_SPHAIRON_UB801R     0x0110          /* UB801R */
-
 /* Sony Ericsson products */
-#define        USB_PRODUCT_SUSTEEN_DCU10       0x0528          /* USB Cable */
+#define        USB_PRODUCT_SONYERICSSON_DCU10  0x0528          /* USB Cable */
 
 /* SOURCENEXT products */
 #define        USB_PRODUCT_SOURCENEXT_KEIKAI8  0x039f          /* KeikaiDenwa 8 */
 #define        USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG      0x012e          /* KeikaiDenwa 8 with charger */
 
+/* Sphairon Access Systems GmbH product */
+#define        USB_PRODUCT_SPHAIRON_UB801R     0x0110          /* UB801R */
+
 /* STMicroelectronics products */
+#define        USB_PRODUCT_STMICRO_BIOCPU      0x2016          /* Biometric Coprocessor */
 #define        USB_PRODUCT_STMICRO_COMMUNICATOR        0x7554          /* USB Communicator */
 
 /* STSN products */
 #define        USB_PRODUCT_SUNTAC_AS144L4      0x0011          /* SUNTAC U-Cable type A4 */
 
 /* Sun Microsystems products */
-#define        USB_PRODUCT_SUN2_KEYBOARD       0x0005          /* Type 6 USB keyboard */
+#define        USB_PRODUCT_SUN_KEYBOARD_TYPE_6 0x0005          /* Type 6 USB keyboard */
+#define        USB_PRODUCT_SUN_KEYBOARD_TYPE_7 0x00a2          /* Type 7 USB keyboard */
 /* XXX The above is a North American PC style keyboard possibly */
-#define        USB_PRODUCT_SUN2_MOUSE  0x0100          /* Type 6 USB mouse */
+#define        USB_PRODUCT_SUN_MOUSE   0x0100          /* Type 6 USB mouse */
 
 /* Surecom Technology products */
 #define        USB_PRODUCT_SURECOM_RT2570      0x11f3          /* RT2570 */
 /* Tangtop products */
 #define        USB_PRODUCT_TANGTOP_USBPS2      0x0001          /* USBPS2 */
 
+/* Tapwave products */
+#define        USB_PRODUCT_TAPWAVE_ZODIAC      0x0100          /* Zodiac */
+
 /* Taugagreining products */
 #define        USB_PRODUCT_TAUGA_CAMERAMATE    0x0005          /* CameraMate (DPCM_USB) */
 
 /* Telex Communications products */
 #define        USB_PRODUCT_TELEX_MIC1  0x0001          /* Enhanced USB Microphone */
 
+/* Ten X Technology, Inc. */
+#define        USB_PRODUCT_TENX_UAUDIO0        0xf211          /* USB audio headset */
+
 /* Texas Intel products */
 #define        USB_PRODUCT_TI_UTUSB41  0x1446          /* UT-USB41 hub */
 #define        USB_PRODUCT_TI_TUSB2046 0x2046          /* TUSB2046 hub */
 /* Todos Data System products */
 #define        USB_PRODUCT_TODOS_ARGOS_MINI    0x0002          /* Argos Mini Smartcard Reader */
 
+/* Topre Corporation products */
+#define        USB_PRODUCT_TOPRE_HHKB  0x0100          /* HHKB Professional */
+
 /* Toshiba Corporation products */
 #define        USB_PRODUCT_TOSHIBA_POCKETPC_E740       0x0706          /* PocketPC e740 */
 
 /* Trek Technology products */
 #define        USB_PRODUCT_TREK_THUMBDRIVE     0x1111          /* ThumbDrive */
+#define        USB_PRODUCT_TREK_MEMKEY 0x8888          /* IBM USB Memory Key */
 #define        USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988          /* ThumbDrive 8MB */
 
 /* Tripp-Lite products */
 #define        USB_PRODUCT_TRIPPLITE_U209      0x2008          /* U209 Serial adapter */
 
 /* Trumpion products */
+#define        USB_PRODUCT_TRUMPION_T33520     0x1001          /* T33520 USB Flash Card Controller */
 #define        USB_PRODUCT_TRUMPION_T33521     0x1003          /* USB/MP3 decoder */
 #define        USB_PRODUCT_TRUMPION_C3310      0x1100          /* Comotron C3310 MP3 player */
+#define        USB_PRODUCT_TRUMPION_MP3        0x1200          /* MP3 player */
 
 /* Tsunami products */
 #define        USB_PRODUCT_TSUNAMI_SM2000      0x1111          /* SM-2000 */
 #define        USB_PRODUCT_UMAX_ASTRA2200U     0x0230          /* Astra 2200U Scanner */
 #define        USB_PRODUCT_UMAX_ASTRA3400      0x0060          /* Astra 3400 Scanner */
 
+/* U-MEDIA Communications products */
+#define        USB_PRODUCT_UMEDIA_TEW444UBEU   0x3006          /* TEW-444UB EU */
+#define        USB_PRODUCT_UMEDIA_TEW444UBEU_NF        0x3007          /* TEW-444UB EU (no firmware) */
+#define        USB_PRODUCT_UMEDIA_TEW429UB_A   0x300a          /* TEW-429UB_A */
+#define        USB_PRODUCT_UMEDIA_TEW429UB     0x300b          /* TEW-429UB */
+#define        USB_PRODUCT_UMEDIA_AR5523_2     0x3205          /* AR5523 */
+#define        USB_PRODUCT_UMEDIA_AR5523_2_NF  0x3206          /* AR5523 (no firmware) */
+
 /* Universal Access products */
 #define        USB_PRODUCT_UNIACCESS_PANACHE   0x0101          /* Panache Surf USB ISDN Adapter */
 
 #define        USB_PRODUCT_WACOM_GD0912U       0x0022          /* Intuos 9x12 Graphics Tablet */
 
 /* Western Digital products */
+#define        USB_PRODUCT_WESTERN_COMBO       0x0200          /* Firewire USB Combo */
 #define        USB_PRODUCT_WESTERN_EXTHDD      0x0400          /* External HDD */
 #define        USB_PRODUCT_WESTERN_HUB 0x0500          /* USB HUB */
+#define        USB_PRODUCT_WESTERN_MYBOOK      0x0901          /* MyBook External HDD */
+
+/* Windbond Electronics */
+#define        USB_PRODUCT_WINBOND_UH104       0x5518          /* 4-port USB Hub */
+
+/* WinMaxGroup products */
+#define        USB_PRODUCT_WINMAXGROUP_FLASH64MC       0x6660          /* USB Flash Disk 64M-C */
+
+/* Wistron NeWeb products */
+#define        USB_PRODUCT_WISTRONNEWEB_UR055G 0x0711          /* UR055G */
+#define        USB_PRODUCT_WISTRONNEWEB_AR5523_1       0x0826          /* AR5523 */
+#define        USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF    0x0827          /* AR5523 (no firmware) */
+#define        USB_PRODUCT_WISTRONNEWEB_AR5523_2       0x0828          /* AR5523 */
+#define        USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF    0x0829          /* AR5523 (no firmware) */
+
+/* Xerox products */
+#define        USB_PRODUCT_XEROX_WCM15 0xffef          /* WorkCenter M15 */
 
 /* Xirlink products */
 #define        USB_PRODUCT_XIRLINK_IMAGING     0x800d          /* IMAGING DEVICE */
 
 /* Yano products */
 #define        USB_PRODUCT_YANO_U640MO 0x0101          /* U640MO-03 */
+#define        USB_PRODUCT_YANO_FW800HD        0x05fc          /* METALWEAR-HDD */
+
+/* Z-Com products */
+#define        USB_PRODUCT_ZCOM_M4Y750 0x0001          /* M4Y-750 */
+#define        USB_PRODUCT_ZCOM_XI725  0x0002          /* XI-725/726 */
+#define        USB_PRODUCT_ZCOM_XI735  0x0005          /* XI-735 */
+#define        USB_PRODUCT_ZCOM_AR5523 0x0012          /* AR5523 */
+#define        USB_PRODUCT_ZCOM_AR5523_NF      0x0013          /* AR5523 driver (no firmware) */
 
 /* Zeevo, Inc. products */
 #define        USB_PRODUCT_ZEEVO_BLUETOOTH     0x07d0          /* BT-500 Bluetooth USB Adapter */
index 19b9e4f..883d994 100644 (file)
@@ -1,10 +1,10 @@
-/*     $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.17 2007/02/10 05:44:19 sephe Exp $ */
+/*     $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.18 2007/07/27 18:07:21 hasso Exp $ */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     DragonFly: src/sys/bus/usb/usbdevs,v 1.20 2006/12/24 05:16:43 sephe Exp 
+ *     DragonFly: src/sys/bus/usb/usbdevs,v 1.23 2007/07/27 17:49:29 hasso Exp 
  */
 /* $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ */
 /* $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */
@@ -72,16 +72,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "3CRSHEW696 Wireless adapter",
        },
        {
-           USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
+           USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
            0,
            "3Com",
-           "U.S.Robotics 56000 Voice Faxmodem Pro",
+           "HomeConnect 3C460",
        },
        {
-           USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
+           USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
            0,
            "3Com",
-           "HomeConnect 3C460",
+           "U.S.Robotics 56000 Voice Faxmodem Pro",
        },
        {
            USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B,
@@ -89,6 +89,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "3Com",
            "HomeConnect 3C460B",
        },
+       {
+           USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075,
+           0,
+           "3Com",
+           "3CRUSB10075",
+       },
+       {
+           USB_VENDOR_3COM3, USB_PRODUCT_3COM3_AR5523_1,
+           0,
+           "3Com",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_3COM3, USB_PRODUCT_3COM3_AR5523_2,
+           0,
+           "3Com",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_3COM3, USB_PRODUCT_3COM3_AR5523_3,
+           0,
+           "3Com",
+           "AR5523",
+       },
        {
            USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
            0,
@@ -210,16 +234,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "UFE2000 USB2.0 Fast Ethernet Adapter",
        },
        {
-           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54,
            0,
            "AboCom Systems",
-           "XX10",
+           "WL54",
        },
        {
-           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573,
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10,
            0,
            "AboCom Systems",
-           "RT2573",
+           "XX10",
        },
        {
            USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_HWU54DM,
@@ -228,13 +252,19 @@ const struct usb_knowndev usb_knowndevs[] = {
            "HWU54DM",
        },
        {
-           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_1,
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_2,
            0,
            "AboCom Systems",
            "RT2573",
        },
        {
-           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_2,
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_3,
+           0,
+           "AboCom Systems",
+           "RT2573",
+       },
+       {
+           USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_4,
            0,
            "AboCom Systems",
            "RT2573",
@@ -251,18 +281,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Accton Technology",
            "USB320-EC Ethernet Adapter",
        },
+       {
+           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_SMCWUSBG,
+           0,
+           "Accton Technology",
+           "SMCWUSB-G",
+       },
        {
            USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001,
            0,
            "Accton Technology",
            "SpeedStream Ethernet Adapter",
        },
+       {
+           USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B,
+           0,
+           "Accton Technology",
+           "ZD1211B",
+       },
+       {
+           USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000,
+           0,
+           "Aceeca",
+           "MEZ1000 RDA",
+       },
+       {
+           USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
+           0,
+           "Acer Communications & Multimedia",
+           "EP-1427X-2 Ethernet Adapter",
+       },
+       {
+           USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632,
+           0,
+           "Acer Labs",
+           "USB 2.0 Data Link",
+       },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
            0,
@@ -287,23 +353,41 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Acer Peripherals",
            "Acerscan 620U",
        },
+       {
+           USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_4300U,
+           0,
+           "Acer Peripherals",
+           "Benq 3300U/4300U",
+       },
+       {
+           USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640BT,
+           0,
+           "Acer Peripherals",
+           "Acerscan 640BT",
+       },
+       {
+           USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_1240U,
+           0,
+           "Acer Peripherals",
+           "Acerscan 1240U",
+       },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ATAPI,
            0,
            "Acer Peripherals",
-           "ATA/ATAPI adapter",
+           "ATA/ATAPI Adapter",
        },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL300,
            0,
            "Acer Peripherals",
-           "AWL300",
+           "AWL300 Wireless Adapter",
        },
        {
            USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL400,
            0,
            "Acer Peripherals",
-           "AWL400",
+           "AWL400 Wireless Adapter",
        },
        {
            USB_VENDOR_ACERW, USB_PRODUCT_ACERW_WARPLINK,
@@ -371,17 +455,23 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Actiontec Electronics",
            "UAT1 Wireless Ethernet adapter",
        },
+       {
+           USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4,
+           0,
+           "ADMtek",
+           "AN986A Ethernet",
+       },
        {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
            0,
            "ADMtek",
-           "AN986 USB Ethernet",
+           "AN986 Ethernet",
        },
        {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII,
            0,
            "ADMtek",
-           "AN8511 USB Ethernet",
+           "AN8511 Ethernet",
        },
        {
            USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2,
@@ -389,6 +479,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ADMtek",
            "AN8513 Ethernet",
        },
+       {
+           USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3,
+           0,
+           "ADMtek",
+           "AN8515 Ethernet",
+       },
+       {
+           USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_CABLE_205,
+           0,
+           "Addonics Technology",
+           "Cable 205",
+       },
+       {
+           USB_VENDOR_ADDTRON, USB_PRODUCT_ADDTRON_AWU120,
+           0,
+           "",
+           "AWU-120",
+       },
        {
            USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
            0,
@@ -473,6 +581,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "AGFA-Gevaert",
            "SnapScan e52",
        },
+       {
+           USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B,
+           0,
+           "Aincomm",
+           "AWU2000B",
+       },
        {
            USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3,
            0,
@@ -480,10 +594,10 @@ const struct usb_knowndev usb_knowndevs[] = {
            "PenCam Mega 1.3",
        },
        {
-           USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B,
+           USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220,
            0,
-           "Aincomm",
-           "AWU2000B",
+           "AirPrime, Inc.",
+           "CDMA Wireless PC Card",
        },
        {
            USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
@@ -521,6 +635,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "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,
@@ -534,10 +654,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ASC495 Speakers",
        },
        {
-           USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
+           USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_WLAN,
            0,
-           "American Power Conversion",
-           "Back-UPS Pro 500",
+           "Ambit Microsystems",
+           "WLAN",
+       },
+       {
+           USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250,
+           0,
+           "Ambit Microsystems",
+           "NTL 250 cable modem",
        },
        {
            USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO,
@@ -557,12 +683,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Anchor Chips",
            "EZLINK",
        },
+       {
+           USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X,
+           0,
+           "AnyDATA Corporation",
+           "CDMA 2000 1xRTT/EV-DO USB Modem",
+       },
        {
            USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
            0,
            "AOX",
            "USB ethernet controller engine",
        },
+       {
+           USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
+           0,
+           "American Power Conversion",
+           "Back-UPS Pro 500",
+       },
        {
            USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE,
            0,
@@ -575,6 +713,72 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Apple Computer",
            "Speakers",
        },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD,
+           0,
+           "Apple Computer",
+           "iPod",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD2G,
+           0,
+           "Apple Computer",
+           "iPod 2G",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD3G,
+           0,
+           "Apple Computer",
+           "iPod 3G",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_04,
+           0,
+           "Apple Computer",
+           "iPod '04'",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPODMINI,
+           0,
+           "Apple Computer",
+           "iPod Mini",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_06,
+           0,
+           "Apple Computer",
+           "iPod '06'",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_07,
+           0,
+           "Apple Computer",
+           "iPod '07'",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_08,
+           0,
+           "Apple Computer",
+           "iPod '08'",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPODVIDEO,
+           0,
+           "Apple Computer",
+           "iPod Video",
+       },
+       {
+           USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPODNANO,
+           0,
+           "Apple Computer",
+           "iPod Nano",
+       },
+       {
+           USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116,
+           0,
+           "Arkmicro Technologies Inc.",
+           "ARK3116 Serial",
+       },
        {
            USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230,
            0,
@@ -599,22 +803,34 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ASIX Electronics",
            "USB 2.0 10/100 ethernet controller",
        },
+       {
+           USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178,
+           0,
+           "ASIX Electronics",
+           "AX88178",
+       },
+       {
+           USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772,
+           0,
+           "ASIX Electronics",
+           "AX88772",
+       },
        {
            USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G,
            0,
-           "ASUS",
+           "ASUSTeK Computer",
            "WL-167g wireless adapter",
        },
        {
            USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G_2,
            0,
-           "ASUS",
+           "ASUSTeK Computer",
            "WL-167g wireless adapter",
        },
        {
            USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G_3,
            0,
-           "ASUS",
+           "ASUSTeK Computer",
            "WL-167g wireless adapter",
        },
        {
@@ -629,18 +845,78 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ATEN International",
            "10Mbps ethernet adapter",
        },
+       {
+           USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T,
+           0,
+           "ATEN International",
+           "UC-110T ethernet adapter",
+       },
        {
            USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
            0,
            "ATEN International",
            "Serial adapter",
        },
+       {
+           USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T,
+           0,
+           "ATEN International",
+           "UC-210T ethernet adapter",
+       },
        {
            USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C,
            0,
            "ATEN International",
            "DSB-650C",
        },
+       {
+           USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523,
+           0,
+           "Atheros Communications",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_NF,
+           0,
+           "Atheros Communications",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_1,
+           0,
+           "Atheros Communications",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_1_NF,
+           0,
+           "Atheros Communications",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_2,
+           0,
+           "Atheros Communications",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_2_NF,
+           0,
+           "Atheros Communications",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_3,
+           0,
+           "Atheros Communications",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_3_NF,
+           0,
+           "Atheros Communications",
+           "AR5523 (no firmware)",
+       },
        {
            USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205,
            0,
@@ -726,22 +1002,34 @@ const struct usb_knowndev usb_knowndevs[] = {
            "F5U002 Parallel printer adapter",
        },
        {
-           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103,
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D6050,
            0,
            "Belkin Components",
-           "F5U103 Serial adapter",
+           "F5D6050 802.11b Wireless adapter",
        },
        {
-           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109,
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_FBT001V,
            0,
            "Belkin Components",
-           "F5U109 Serial adapter",
+           "FBT001v2 Bluetooth",
        },
        {
-           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_FBT003V,
+           0,
+           "Belkin Components",
+           "FBT003v2 Bluetooth",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103,
+           0,
+           "Belkin Components",
+           "F5U103 Serial adapter",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109,
            0,
            "Belkin Components",
-           "F5U409 Serial",
+           "F5U109 Serial adapter",
        },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
@@ -767,12 +1055,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Belkin Components",
            "F5U237 USB 2.0 7-Port Hub",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U257,
+           0,
+           "Belkin Components",
+           "F5U257 Serial",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
            0,
            "Belkin Components",
            "F5U409 Serial adapter",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR,
+           0,
+           "Belkin Components",
+           "F6C550-AVR UPS",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_UPS,
            0,
@@ -785,12 +1085,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Belkin Components",
            "F5U120-PC Hub",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B,
+           0,
+           "Belkin Components",
+           "ZD1211B",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D5055,
+           0,
+           "Belkin Components",
+           "F5D5055",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050,
            0,
            "Belkin Components",
            "F5D7050 wireless adapter",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7051,
+           0,
+           "Belkin Components",
+           "F5D7051 54g USB Network Adapter",
+       },
        {
            USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A,
            0,
@@ -803,6 +1121,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Belkin Components",
            "F5D9050 ver 3",
        },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050_V4000,
+           0,
+           "Belkin Components",
+           "F5D7050 v4000 wireless adapter",
+       },
+       {
+           USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3,
+           0,
+           "Belkin Components",
+           "F5D9050 ver 3 wireless adapter",
+       },
+       {
+           USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
+           0,
+           "Belkin Components",
+           "F5U002 Parallel printer",
+       },
        {
            USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
            0,
@@ -827,6 +1163,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Billionton Systems",
            "USBE100",
        },
+       {
+           USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR,
+           0,
+           "Billionton Systems",
+           "USB2AR Ethernet",
+       },
        {
            USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
            0,
@@ -864,16 +1206,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CanoScan N1220U",
        },
        {
-           USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U,
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_D660U,
            0,
            "Canon",
-           "CanoScan N676U",
+           "CanoScan D660U",
        },
        {
-           USB_VENDOR_CANON, USB_PRODUCT_CANON_D660U,
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U,
            0,
            "Canon",
-           "CanoScan D660U",
+           "CanoScan N676U",
        },
        {
            USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U,
@@ -881,6 +1223,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Canon",
            "CanoScan N1240U",
        },
+       {
+           USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE25,
+           0,
+           "Canon",
+           "CanoScan LIDE 25",
+       },
        {
            USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
            0,
@@ -977,6 +1325,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CCYU Technology",
            "EasyDisk Portable Device",
        },
+       {
+           USB_VENDOR_CENTURY, USB_PRODUCT_CENTURY_EX35QUAT,
+           0,
+           "Century Corp",
+           "Century USB Disk Enclosure",
+       },
        {
            USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
            0,
@@ -1043,6 +1397,66 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CH Products",
            "Flight Sim Yoke",
        },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G,
+           0,
+           "Cisco-Linksys",
+           "WUSB54G wireless adapter",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP,
+           0,
+           "Cisco-Linksys",
+           "WUSB54GP wireless adapter",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2,
+           0,
+           "Cisco-Linksys",
+           "USB200M v2",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS,
+           0,
+           "Cisco-Linksys",
+           "HU200TS wireless adapter",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC,
+           0,
+           "Cisco-Linksys",
+           "WUSB54GC",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR,
+           0,
+           "Cisco-Linksys",
+           "WUSB54GR",
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G,
+           0,
+           "Cisco-Linksys",
+           "WUSBF54G",
+       },
+       {
+           USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510,
+           0,
+           "CMOTECH Co., Ltd.",
+           "CMOTECH CDMA Technologies USB modem",
+       },
+       {
+           USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU550,
+           0,
+           "CMOTECH Co., Ltd.",
+           "CDMA 2000 1xRTT/1xEVDO USB modem",
+       },
+       {
+           USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1,
+           0,
+           "CMOTECH Co., Ltd.",
+           "CMOTECH CDMA Technologies USB modem",
+       },
        {
            USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
            0,
@@ -1092,13 +1506,49 @@ const struct usb_knowndev usb_knowndevs[] = {
            "USB to PS2 Adaptor",
        },
        {
-           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54U,
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C11U,
+           0,
+           "Conceptronic",
+           "C11U",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_WL210,
+           0,
+           "Conceptronic",
+           "WL-210",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_1,
+           0,
+           "Conceptronic",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_1_NF,
+           0,
+           "Conceptronic",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_2,
            0,
            "Conceptronic",
-           "C54U wireless adapter",
+           "AR5523",
        },
        {
-           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54RU2,
+           USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF,
+           0,
+           "Conceptronic",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU,
+           0,
+           "Conceptronic",
+           "C54RU WLAN",
+       },
+       {
+           USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU2,
            0,
            "Conceptronic",
            "C54RU",
@@ -1157,6 +1607,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "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,
@@ -1187,6 +1643,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Creative Labs",
            "Voip Blaster",
        },
+       {
+           USB_VENDOR_CREATIVE3, USB_PRODUCT_CREATIVE3_OPTICAL_MOUSE,
+           0,
+           "Creative Labs",
+           "Notebook Optical Mouse",
+       },
        {
            USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631,
            0,
@@ -1235,6 +1697,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Chuntex",
            "Ex1300 hub",
        },
+       {
+           USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_HX550C,
+           0,
+           "Curitel Communications Inc",
+           "CDMA 2000 1xRTT USB modem (HX-550C)",
+       },
+       {
+           USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_HX57XB,
+           0,
+           "Curitel Communications Inc",
+           "CDMA 2000 1xRTT USB modem (HX-570/575B/PR-600)",
+       },
+       {
+           USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740,
+           0,
+           "Curitel Communications Inc",
+           "Broadband wireless modem",
+       },
        {
            USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
            0,
@@ -1253,6 +1733,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Cypress Semiconductor",
            "Keyboard/Hub",
        },
+       {
+           USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY,
+           0,
+           "Cypress Semiconductor",
+           "MetaGeek Wi-Spy",
+       },
        {
            USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
            0,
@@ -1313,12 +1799,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Dell",
            "TrueMobile 1180 WLAN",
        },
+       {
+           USB_VENDOR_DELL, USB_PRODUCT_DELL_TM350,
+           0,
+           "Dell",
+           "TrueMobile 350 Bluetooth USB Adapter",
+       },
        {
            USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
            0,
            "DeLorme Publishing",
            "Earthmate GPS",
        },
+       {
+           USB_VENDOR_DESKNOTE, USB_PRODUCT_DESKNOTE_UCR_61S2B,
+           0,
+           "Desknote",
+           "UCR-61S2B",
+       },
        {
            USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
            0,
@@ -1374,22 +1872,76 @@ const struct usb_knowndev usb_knowndevs[] = {
            "10/100 ethernet adapter",
        },
        {
-           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122,
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL120E,
            0,
            "D-Link",
-           "Wireless DWLG122-b1",
+           "DWL-120 rev E",
        },
        {
-           USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1,
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
            0,
            "D-Link",
-           "DWL-G122 rev C1",
+           "DWL-122",
        },
        {
-           USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340,
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG120,
            0,
            "D-Link",
-           "WUA-1340",
+           "DWL-G120",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL120F,
+           0,
+           "D-Link",
+           "DWL-120 rev F",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLAG132,
+           0,
+           "D-Link",
+           "DWL-AG132",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLAG132_NF,
+           0,
+           "D-Link",
+           "DWL-AG132 (no firmware)",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG132,
+           0,
+           "D-Link",
+           "DWL-G132",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG132_NF,
+           0,
+           "D-Link",
+           "DWL-G132 (no firmware)",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLAG122,
+           0,
+           "D-Link",
+           "DWL-AG122",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLAG122_NF,
+           0,
+           "D-Link",
+           "DWL-AG122 (no firmware)",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122,
+           0,
+           "D-Link",
+           "DWL-G122 b1 wireless adapter",
+       },
+       {
+           USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1,
+           0,
+           "D-Link",
+           "DUB-E100 rev B1",
        },
        {
            USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
@@ -1433,16 +1985,28 @@ const struct usb_knowndev usb_knowndevs[] = {
            "D-Link",
            "10/100 ethernet adapter",
        },
+       {
+           USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1,
+           0,
+           "D-Link",
+           "DWL-G122 rev C1",
+       },
+       {
+           USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340,
+           0,
+           "D-Link",
+           "WUA-1340",
+       },
        {
            USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
            0,
-           "eGalax",
+           "eGalax, Inc.",
            "Touch Panel",
        },
        {
            USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL2,
            0,
-           "eGalax",
+           "eGalax, Inc.",
            "Touch Panel",
        },
        {
@@ -1463,6 +2027,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Eicon Networks",
            "Diva 852 ISDN TA",
        },
+       {
+           USB_VENDOR_DMI, USB_PRODUCT_DMI_CFSM_RW,
+           0,
+           "DMI",
+           "CF/SM Reader/Writer",
+       },
        {
            USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
            0,
@@ -1475,6 +2045,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "EIZO",
            "monitor",
        },
+       {
+           USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN,
+           0,
+           "ELCON Systemtechnik",
+           "Goldpfeil P-LAN",
+       },
        {
            USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
            0,
@@ -1505,6 +2081,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Elecom",
            "LD-USB/TX",
        },
+       {
+           USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20,
+           0,
+           "Elecom",
+           "LD-USB20",
+       },
        {
            USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT,
            0,
@@ -1721,6 +2303,60 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Seiko Epson",
            "Perfection 1670 scanner",
        },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1270,
+           0,
+           "Seiko Epson",
+           "Perfection 1270 scanner",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480,
+           0,
+           "Seiko Epson",
+           "Perfection 2480 scanner",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590,
+           0,
+           "Seiko Epson",
+           "Perfection 3590 scanner",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990,
+           0,
+           "Seiko Epson",
+           "Perfection 4990 Photo scanner",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_STYLUS_875DC,
+           0,
+           "Seiko Epson",
+           "Stylus Photo 875DC Card Reader",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_STYLUS_895,
+           0,
+           "Seiko Epson",
+           "Stylus Photo 895 Card Reader",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500,
+           0,
+           "Seiko Epson",
+           "CX-3500/3600/3650 MFP",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX425,
+           0,
+           "Seiko Epson",
+           "Stylus Photo RX425 scanner",
+       },
+       {
+           USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200,
+           0,
+           "Seiko Epson",
+           "CX4200 MP scanner",
+       },
        {
            USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
            0,
@@ -1757,6 +2393,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Griffin Technology",
            "iMate, ADB adapter",
        },
+       {
+           USB_VENDOR_FEIYA, USB_PRODUCT_FEIYA_5IN1,
+           0,
+           "Feiya",
+           "5-in-1 Card Reader",
+       },
+       {
+           USB_VENDOR_FOSSIL, USB_PRODUCT_FOSSIL_WRISTPDA,
+           0,
+           "Fossil, Inc",
+           "Wrist PDA",
+       },
        {
            USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
            0,
@@ -1769,6 +2417,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Future Technology Devices",
            "8U232AM Serial converter",
        },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C,
+           0,
+           "Future Technology Devices",
+           "FT2232C Dual port Serial",
+       },
        {
            USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
            0,
@@ -1782,85 +2436,163 @@ const struct usb_knowndev usb_knowndevs[] = {
            "8U100AX Serial converter",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200_USB,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M,
            0,
            "Future Technology Devices",
-           "Matrix Orbital MX200 Series LCD",
+           "OpenPort 1.3 Mitsubishi",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24_USB,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S,
            0,
            "Future Technology Devices",
-           "Matrix Orbital LK202-24 LCD",
+           "OpenPort 1.3 Subaru",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK204_24,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U,
            0,
            "Future Technology Devices",
-           "Matrix Orbital LK204-24 LCD",
+           "OpenPort 1.3 Universal",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EISCOU,
            0,
            "Future Technology Devices",
-           "Crystalfontz CFA-632 LCD",
+           "Expert ISDN Control USB",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_UOPTBR,
            0,
            "Future Technology Devices",
-           "Crystalfontz CFA-634 LCD",
+           "USB-RS232 OptoBridge",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EMCU2D,
            0,
            "Future Technology Devices",
-           "Crystalfontz CFA-633 LCD",
+           "Expert mouseCLOCK USB II",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PCMSFU,
            0,
            "Future Technology Devices",
-           "Crystalfontz CFA-631 LCD",
+           "Precision Clock MSF USB",
        },
        {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EMCU2H,
            0,
            "Future Technology Devices",
-           "SEMC DSS-20 SyncStation",
+           "Expert mouseCLOCK USB II HBG",
        },
        {
-           USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBSERIAL,
            0,
-           "Fuji Photo Film",
-           "Mass Storage",
+           "Future Technology Devices",
+           "Matrix Orbital USB Serial",
        },
        {
-           USB_VENDOR_FUJITSU, USB_PRODUCT_FUJITSU_AH_F401U,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX2_3,
            0,
-           "Fujitsu",
-           "AH-F401U Air H device",
+           "Future Technology Devices",
+           "Matrix Orbital MX2 or MX3 LCD",
        },
        {
-           USB_VENDOR_GENERALINSTMNTS, USB_PRODUCT_GENERALINSTMNTS_SB5100,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX4_5,
            0,
-           "General Instruments (Motorola)",
-           "SURFboard SB5100 Cable modem",
+           "Future Technology Devices",
+           "Matrix Orbital MX4 or MX5 LCD",
        },
        {
-           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24_USB,
            0,
-           "Genesys Logic",
-           "GeneLink Host-Host Bridge",
+           "Future Technology Devices",
+           "Matrix Orbital LK202-24 LCD",
        },
        {
-           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK204_24,
            0,
-           "Genesys Logic",
-           "GL650 Hub",
+           "Future Technology Devices",
+           "Matrix Orbital LK204-24 LCD",
        },
        {
-           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
+           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_634,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-634 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-633 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-631 LCD",
+       },
+       {
+           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_635,
+           0,
+           "Future Technology Devices",
+           "Crystalfontz CFA-635 USB 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_GARMIN, USB_PRODUCT_GARMIN_IQUE_3600,
+           0,
+           "Garmin International",
+           "iQue 3600",
+       },
+       {
+           USB_VENDOR_GENERALINSTMNTS, USB_PRODUCT_GENERALINSTMNTS_SB5100,
+           0,
+           "General Instruments (Motorola)",
+           "SURFboard SB5100 Cable modem",
+       },
+       {
+           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL620USB,
+           0,
+           "Genesys Logic",
+           "GL620USB Host-Host interface",
+       },
+       {
+           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 Card Reader",
@@ -1877,6 +2609,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Genesys Logic",
            "GL641USB USB-IDE Bridge",
        },
+       {
+           USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB_2,
+           0,
+           "Genesys Logic",
+           "GL641USB 6-in-1 Card Reader",
+       },
+       {
+           USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GN54G,
+           0,
+           "GIGABYTE",
+           "GN-54G",
+       },
+       {
+           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,
@@ -1895,18 +2651,84 @@ const struct usb_knowndev usb_knowndevs[] = {
            "GIGABYTE",
            "GN-WI05GS",
        },
+       {
+           USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_WLAN,
+           0,
+           "Gigaset",
+           "WLAN",
+       },
+       {
+           USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_SMCWUSBTG,
+           0,
+           "Gigaset",
+           "SMCWUSBT-G",
+       },
+       {
+           USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_SMCWUSBTG_NF,
+           0,
+           "Gigaset",
+           "SMCWUSBT-G (no firmware)",
+       },
+       {
+           USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_AR5523,
+           0,
+           "Gigaset",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_AR5523_NF,
+           0,
+           "Gigaset",
+           "AR5523 (no firmware)",
+       },
        {
            USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573,
            0,
            "Gigaset",
            "RT2573",
        },
+       {
+           USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_1,
+           0,
+           "Global Sun Technology",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_1_NF,
+           0,
+           "Global Sun Technology",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_2,
+           0,
+           "Global Sun Technology",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_2_NF,
+           0,
+           "Global Sun Technology",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00,
+           0,
+           "G.Mate, Inc",
+           "YP3X00 PDA",
+       },
        {
            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_GOODWAY, USB_PRODUCT_GOODWAY_RT2573,
            0,
@@ -2219,6 +3041,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Hewlett Packard",
            "DeskJet 816C",
        },
+       {
+           USB_VENDOR_HP, USB_PRODUCT_HP_82x0C,
+           0,
+           "Hewlett Packard",
+           "Scanjet 82x0C",
+       },
        {
            USB_VENDOR_HP, USB_PRODUCT_HP_2300D,
            0,
@@ -2309,6 +3137,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Huawei 3Com",
            "RT2573",
        },
+       {
+           USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE,
+           0,
+           "Huawei Technologies",
+           "Huawei Mobile",
+       },
        {
            USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE,
            0,
@@ -2327,6 +3161,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Iiyama",
            "Hub",
        },
+       {
+           USB_VENDOR_IMAGINATION, USB_PRODUCT_IMAGINATION_DBX1,
+           0,
+           "Imagination Technologies",
+           "DBX1 DSP core",
+       },
        {
            USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO,
            0,
@@ -2591,12 +3431,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "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_ETGUS2,
+           0,
+           "I-O Data",
+           "ETG-US2",
+       },
        {
            USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
            0,
@@ -2651,6 +3503,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "iRiver",
            "iFP-5xx",
        },
+       {
+           USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20,
+           0,
+           "I-Tuner Networks",
+           "USB-LCD 2x20",
+       },
        {
            USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA,
            0,
@@ -2754,153 +3612,171 @@ const struct usb_knowndev usb_knowndevs[] = {
            "VideoCAM VGA",
        },
        {
-           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18,
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28_NF,
            0,
-           "Keyspan",
-           "USA-18 serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-28 serial adapter (no firmware)",
        },
        {
-           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF,
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X_NF,
            0,
-           "Keyspan",
-           "USA-18 serial adapter (no firmware)",
+           "Keyspan / InnoSys Inc.",
+           "USA-28X serial adapter (no firmware)",
        },
        {
-           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19_NF,
            0,
-           "Keyspan",
-           "USA-18X serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-19 serial adapter (no firmware)",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF,
+           0,
+           "Keyspan / InnoSys Inc.",
+           "USA-18 serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X_NF,
            0,
-           "Keyspan",
-           "USA-18X serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-18X serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W_NF,
            0,
-           "Keyspan",
-           "USA-19W serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-19W serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19 serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19W serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W_NF,
            0,
-           "Keyspan",
-           "USA-49W serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-49W serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-49W serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI_NF,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19QI serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19QI serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q_NF,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19Q serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19Q serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-28 serial adapter",
        },
        {
-           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X,
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB,
            0,
-           "Keyspan",
-           "USA-28X serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-28X/XB serial adapter",
        },
        {
-           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB,
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18,
            0,
-           "Keyspan",
-           "USA-28X/XB serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-18 serial adapter",
+       },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X,
+           0,
+           "Keyspan / InnoSys Inc.",
+           "USA-18X serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-28XB serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA_NF,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-28XB serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-28XA serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA_NF,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-18XA serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-18XA serial adapter",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW_NF,
            0,
-           "Keyspan",
-           "USA-19QW serial adapter",
+           "Keyspan / InnoSys Inc.",
+           "USA-19QW serial adapter (no firmware)",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "USA-19WQ serial adapter",
        },
+       {
+           USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19HS,
+           0,
+           "Keyspan / InnoSys Inc.",
+           "USA-19HS serial adapter",
+       },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "UIA-10 remote control",
        },
        {
            USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA11,
            0,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            "UIA-11 remote control",
        },
        {
@@ -2993,12 +3869,42 @@ const struct usb_knowndev usb_knowndevs[] = {
            "KYE Systems",
            "ColorPage Vivid-Pro scanner",
        },
+       {
+           USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S3X,
+           0,
+           "Kyocera Wireless Corp.",
+           "Finecam S3x",
+       },
+       {
+           USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S4,
+           0,
+           "Kyocera Wireless Corp.",
+           "Finecam S4",
+       },
+       {
+           USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S5,
+           0,
+           "Kyocera Wireless Corp.",
+           "Finecam S5",
+       },
+       {
+           USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_L3,
+           0,
+           "Kyocera Wireless Corp.",
+           "Finecam L3",
+       },
        {
            USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V,
            0,
-           "Kyocera",
+           "Kyocera Wireless Corp.",
            "AH-K3001V",
        },
+       {
+           USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_CDMA_MSM_K,
+           0,
+           "Kyocera Wireless Corp.",
+           "Qualcomm Kyocera CDMA Technologies MSM",
+       },
        {
            USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD,
            0,
@@ -3029,6 +3935,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Lexar Media",
            "2662W-AR",
        },
+       {
+           USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_CF_READER,
+           0,
+           "Lexar Media",
+           "USB CF Reader",
+       },
        {
            USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_MCR,
            0,
@@ -3275,6 +4187,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Logitech",
            "iFeel Mouse",
        },
+       {
+           USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B,
+           0,
+           "Logitech",
+           "iFeel MouseMan",
+       },
        {
            USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
            0,
@@ -3371,36 +4289,6 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Macally",
            "mouse",
        },
-       {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBSERIAL,
-           0,
-           "Future Technology Devices",
-           "Matrix Orbital USB Serial",
-       },
-       {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX2_3,
-           0,
-           "Future Technology Devices",
-           "Matrix Orbital MX2 or MX3",
-       },
-       {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX4_5,
-           0,
-           "Future Technology Devices",
-           "Matrix Orbital MX4 or MX5",
-       },
-       {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LK202,
-           0,
-           "Future Technology Devices",
-           "Matrix Orbital VK/LK202 Family",
-       },
-       {
-           USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LK204,
-           0,
-           "Future Technology Devices",
-           "Matrix Orbital VK/LK204 Family",
-       },
        {
            USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,
            0,
@@ -3521,6 +4409,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Melco",
            "Nintendo Wi-Fi",
        },
+       {
+           USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1,
+           0,
+           "Melco",
+           "PC-OP-RS1 RemoteStation",
+       },
        {
            USB_VENDOR_MELCO, USB_PRODUCT_MELCO_SG54HP,
            0,
@@ -3533,6 +4427,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Melco",
            "WLI-U2-G54HP",
        },
+       {
+           USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPYX,
+           0,
+           "MetaGeek",
+           "MetaGeek Wi-Spy 2.4x",
+       },
        {
            USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
            0,
@@ -3554,51 +4454,57 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_BT_DONGLE,
            0,
-           "Micro Star",
+           "Micro Star International",
            "Bluetooth USB dongle",
        },
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2570",
        },
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2570",
        },
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2570",
        },
        {
-           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573,
+           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_1,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2573",
        },
        {
-           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_1,
+           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_2,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2573",
        },
        {
-           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_2,
+           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_3,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2573",
        },
        {
-           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_3,
+           USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_4,
            0,
-           "Micro Star",
+           "Micro Star International",
            "RT2573",
        },
+       {
+           USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM,
+           0,
+           "",
+           "TwinkleCam USB camera",
+       },
        {
            USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
            0,
@@ -3672,27 +4578,57 @@ const struct usb_knowndev usb_knowndevs[] = {
            "10/100 USB NIC",
        },
        {
-           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLINTELLIMOUSE,
            0,
-           "Microtech",
-           "USB-SCSI-DB25",
+           "Microsoft",
+           "Wireless Optical IntelliMouse",
        },
        {
-           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50,
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK,
            0,
-           "Microtech",
-           "USB-SCSI-HD50",
+           "Microsoft",
+           "Wireless Optical Mouse (Model 1023)",
        },
        {
-           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLNOTEBOOK2,
            0,
-           "Microtech",
-           "USB CameraMate",
+           "Microsoft",
+           "Wireless Optical Mouse 3000 (Model 1056)",
        },
        {
-           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM,
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_WLUSBMOUSE,
            0,
-           "Microtech",
+           "Microsoft",
+           "Wireless USB Mouse",
+       },
+       {
+           USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX360,
+           0,
+           "Microsoft",
+           "XBOX 360 WLAN",
+       },
+       {
+           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,
+           0,
+           "Microtech",
+           "USB-SCSI-DB25",
+       },
+       {
+           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50,
+           0,
+           "Microtech",
+           "USB-SCSI-HD50",
+       },
+       {
+           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
+           0,
+           "Microtech",
+           "USB CameraMate",
+       },
+       {
+           USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM,
+           0,
+           "Microtech",
            "Freecom USB-IDE",
        },
        {
@@ -3792,10 +4728,10 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Dimage 5400",
        },
        {
-           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1,
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_F300,
            0,
            "Minolta",
-           "Dimage A1",
+           "Dimage F300",
        },
        {
            USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_XT,
@@ -3803,6 +4739,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Minolta",
            "Dimage Xt",
        },
+       {
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_E223,
+           0,
+           "Minolta",
+           "Dimage E223",
+       },
+       {
+           USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1,
+           0,
+           "Minolta",
+           "Dimage A1",
+       },
        {
            USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
            0,
@@ -3839,6 +4787,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Mobility",
            "Ethernet Adapter",
        },
+       {
+           USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EASIDOCK,
+           0,
+           "Mobility",
+           "EasiDock Ethernet",
+       },
+       {
+           USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703,
+           0,
+           "MosChip Semiconductor",
+           "MCS7703 Serial Port Adapter",
+       },
+       {
+           USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7830,
+           0,
+           "MosChip Semiconductor",
+           "MCS7830 Ethernet",
+       },
        {
            USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
            0,
@@ -3857,16 +4823,40 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Motorola",
            "T720c",
        },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A41XV32X,
+           0,
+           "Motorola",
+           "A41x/V32x Mobile Phones",
+       },
        {
            USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A920,
            0,
            "Motorola",
            "A920",
        },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_E398,
+           0,
+           "Motorola",
+           "E398 Mobile Phone",
+       },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN,
+           0,
+           "Motorola",
+           "USBLAN",
+       },
+       {
+           USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN2,
+           0,
+           "Motorola",
+           "USBLAN",
+       },
        {
            USB_VENDOR_MSI, USB_PRODUCT_MSI_BT_DONGLE,
            0,
-           "Micro Star",
+           "Micro Star International",
            "Bluetooth USB dongle",
        },
        {
@@ -3953,6 +4943,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "M-Systems",
            "DiskOnKey",
        },
+       {
+           USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN,
+           0,
+           "Myson Technology",
+           "USB-IDE",
+       },
        {
            USB_VENDOR_NI, USB_PRODUCT_NI_GPIB_USB_A,
            0,
@@ -4037,6 +5033,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Neodio",
            "Multi-format Flash Controller",
        },
+       {
+           USB_VENDOR_NETAC, USB_PRODUCT_NETAC_CF_CARD,
+           0,
+           "Netac",
+           "USB-CF-Card",
+       },
        {
            USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
            0,
@@ -4049,6 +5051,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "NetChip Technology",
            "Clik! 40",
        },
+       {
+           USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET,
+           0,
+           "NetChip Technology",
+           "Linux Ethernet/RNDIS gadget on pxa210/25x/26x",
+       },
        {
            USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
            0,
@@ -4073,6 +5081,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "BayNETGEAR",
            "USB 2.0 Fast Ethernet Adapter",
        },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111U,
+           0,
+           "BayNETGEAR",
+           "WG111U",
+       },
+       {
+           USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111U_NF,
+           0,
+           "BayNETGEAR",
+           "WG111U (no firmware)",
+       },
        {
            USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
            0,
@@ -4097,6 +5117,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Netgear",
            "MA101 Rev B",
        },
+       {
+           USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T,
+           0,
+           "Netgear",
+           "WG111T",
+       },
+       {
+           USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WG111T_NF,
+           0,
+           "Netgear",
+           "WG111T (no firmware)",
+       },
+       {
+           USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WPN111,
+           0,
+           "Netgear",
+           "WPN111",
+       },
+       {
+           USB_VENDOR_NETGEAR3, USB_PRODUCT_NETGEAR3_WPN111_NF,
+           0,
+           "Netgear",
+           "WPN111 (no firmware)",
+       },
        {
            USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
            0,
@@ -4139,6 +5183,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Nova Technology",
            "RT2573",
        },
+       {
+           USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM,
+           0,
+           "Novatel Wireless",
+           "Novatel Wireless Merlin CDMA",
+       },
+       {
+           USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740,
+           0,
+           "Novatel Wireless",
+           "Merlin U740",
+       },
+       {
+           USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_FLEXPACKGPS,
+           0,
+           "Novatel Wireless",
+           "NovAtel FlexPack GPS receiver",
+       },
        {
            USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
            0,
@@ -4229,6 +5291,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "OnSpec Electronic Inc.",
            "8In2",
        },
+       {
+           USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_IMAGEMATE_SDDR55,
+           0,
+           "OnSpec Electronic Inc.",
+           "ImageMate SDDR55",
+       },
        {
            USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
            0,
@@ -4241,6 +5309,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Ours Technology",
            "Flash Disk 128M",
        },
+       {
+           USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G,
+           0,
+           "",
+           "Vodafone Mobile Connect 3G datacard",
+       },
+       {
+           USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G,
+           0,
+           "",
+           "GlobeTrotter 3G datacard",
+       },
+       {
+           USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD,
+           0,
+           "",
+           "GlobeTrotter 3G QUAD datacard",
+       },
+       {
+           USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS,
+           0,
+           "",
+           "GlobeTrotter 3G+ datacard",
+       },
+       {
+           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_ETHER01PLUS,
+           0,
+           "OQO",
+           "model 01+ Ethernet",
+       },
+       {
+           USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01,
+           0,
+           "OQO",
+           "model 01 Ethernet interface",
+       },
        {
            USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
            0,
@@ -4313,6 +5429,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Panasonic (Matsushita)",
            "LS-120 Camera",
        },
+       {
+           USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXL840AN,
+           0,
+           "Panasonic (Matsushita)",
+           "CD-R Drive KXL-840AN",
+       },
        {
            USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLRW32AN,
            0,
@@ -4367,6 +5489,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Pen Drive",
            "USB 2.0 Flash Drive",
        },
+       {
+           USB_VENDOR_ADDON, USB_PRODUCT_ADDON_A256MB,
+           0,
+           "",
+           "Attache 256MB USB 2.0 Flash Drive",
+       },
+       {
+           USB_VENDOR_ADDON, USB_PRODUCT_ADDON_DISKPRO512,
+           0,
+           "",
+           "USB 2.0 Flash Drive (DANE-ELEC zMate 512MB USB flash drive)",
+       },
        {
            USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
            0,
@@ -4511,6 +5645,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Planex Communications",
            "GW-US11H WLAN",
        },
+       {
+           USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US11S,
+           0,
+           "Planex Communications",
+           "GW-US11S WLAN",
+       },
        {
            USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54HP,
            0,
@@ -4529,6 +5669,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Planex Communications",
            "GW-US54Mini2",
        },
+       {
+           USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54SG,
+           0,
+           "Planex Communications",
+           "GW-US54SG",
+       },
+       {
+           USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL,
+           0,
+           "Planex Communications",
+           "GW-US54GZL",
+       },
+       {
+           USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T,
+           0,
+           "Planex Communications",
+           "GU-1000T",
+       },
+       {
+           USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI,
+           0,
+           "Planex Communications",
+           "GW-US54Mini",
+       },
        {
            USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
            0,
@@ -4763,6 +5927,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Qualcomm",
            "CDMA Technologies MSM modem",
        },
+       {
+           USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM_2,
+           0,
+           "Qualcomm",
+           "CDMA Technologies MSM phone",
+       },
+       {
+           USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_RWT_FCT,
+           0,
+           "Qualcomm",
+           "RWT FCT-CDMA 2000 1xRTT modem",
+       },
        {
            USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM,
            0,
@@ -4979,6 +6155,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "RATOC Systems",
            "USB serial adapter REX-USB60",
        },
+       {
+           USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_USBSERIAL,
+           0,
+           "Sagem",
+           "USB-Serial Controller",
+       },
        {
            USB_VENDOR_SAITEK, USB_PRODUCT_SAITEK_CYBORG_3D_GOLD,
            0,
@@ -4991,6 +6173,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Samsung Electronics",
            "ML-6060 laser printer",
        },
+       {
+           USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_YP_U2,
+           0,
+           "Samsung Electronics",
+           "YP-U2 MP3 Player",
+       },
+       {
+           USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_I500,
+           0,
+           "Samsung Electronics",
+           "I500 Palm USB Phone",
+       },
+       {
+           USB_VENDOR_SAMSUNG_TECHWIN, USB_PRODUCT_SAMSUNG_TECHWIN_DIGIMAX_410,
+           0,
+           "Samsung Techwin",
+           "Digimax 410",
+       },
        {
            USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A,
            0,
@@ -5039,6 +6239,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SanDisk",
            "Cruzer Mini 256MB",
        },
+       {
+           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ4_128,
+           0,
+           "SanDisk",
+           "Cruzer Micro 128MB",
+       },
+       {
+           USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ4_256,
+           0,
+           "SanDisk",
+           "Cruzer Micro 256MB",
+       },
        {
            USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB,
            0,
@@ -5085,31 +6297,37 @@ const struct usb_knowndev usb_knowndevs[] = {
            USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500,
            0,
            "Sharp",
-           "SL5500",
+           "Zaurus SL-5500 PDA",
        },
        {
-           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_A300,
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300,
            0,
            "Sharp",
-           "A300",
+           "Zaurus SL-A300 PDA",
        },
        {
            USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600,
            0,
            "Sharp",
-           "SL5600",
+           "Zaurus SL-5600 PDA",
        },
        {
-           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700,
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700,
            0,
            "Sharp",
-           "C700",
+           "Zaurus SL-C700 PDA",
        },
        {
-           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750,
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750,
            0,
            "Sharp",
-           "C750",
+           "Zaurus SL-C750 PDA",
+       },
+       {
+           USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES,
+           0,
+           "Sharp",
+           "W-ZERO3 ES Smartphone",
        },
        {
            USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
@@ -5201,6 +6419,54 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Siemens",
            "SpeedStream USB 1022",
        },
+       {
+           USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WLL013,
+           0,
+           "Siemens",
+           "WLL013",
+       },
+       {
+           USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_ES75,
+           0,
+           "Siemens",
+           "GSM module MC35",
+       },
+       {
+           USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WL54G,
+           0,
+           "Siemens",
+           "54g USB Network Adapter",
+       },
+       {
+           USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_SX1,
+           0,
+           "Siemens",
+           "SX1",
+       },
+       {
+           USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X65,
+           0,
+           "Siemens",
+           "X65",
+       },
+       {
+           USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X75,
+           0,
+           "Siemens",
+           "X75",
+       },
+       {
+           USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580,
+           0,
+           "Sierra Wireless",
+           "Sierra Wireless AirCard 580",
+       },
+       {
+           USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720,
+           0,
+           "Sierra Wireless",
+           "MC5720 Wireless Modem",
+       },
        {
            USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
            0,
@@ -5243,6 +6509,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SIIG",
            "WINTERREADER Reader",
        },
+       {
+           USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
+           0,
+           "SIIG",
+           "USB TO Ethernet",
+       },
        {
            USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
            0,
@@ -5255,6 +6527,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Silicom",
            "U2E",
        },
+       {
+           USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE,
+           0,
+           "Silicom",
+           "Psion Gold Port Ethernet",
+       },
        {
            USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
            0,
@@ -5286,28 +6564,64 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CN104 serial",
        },
        {
-           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172,
+           USB_VENDOR_SITECOM2, USB_PRODUCT_SITECOM2_WL022,
            0,
-           "Sitecom Europe",
-           "WL-172",
+           "Sitecom",
+           "WL-022",
        },
        {
-           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2,
+           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028,
            0,
            "Sitecom Europe",
-           "WL-113 rev 2",
+           "LN-028",
        },
        {
-           USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
+           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113,
            0,
-           "SmartBridges",
-           "SmartLink USB ethernet adapter",
+           "Sitecom Europe",
+           "WL-113",
        },
        {
-           USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC,
+           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B,
            0,
-           "SmartBridges",
-           "smartNIC 2 PnP Adapter",
+           "Sitecom Europe",
+           "ZD1211B",
+       },
+       {
+           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172,
+           0,
+           "Sitecom Europe",
+           "WL-172",
+       },
+       {
+           USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2,
+           0,
+           "Sitecom Europe",
+           "WL-113 rev 2",
+       },
+       {
+           USB_VENDOR_SKANHEX, USB_PRODUCT_SKANHEX_MD_7425,
+           0,
+           "Skanhex Technology, Inc.",
+           "MD 7425 Camera",
+       },
+       {
+           USB_VENDOR_SKANHEX, USB_PRODUCT_SKANHEX_SX_520Z,
+           0,
+           "Skanhex Technology, Inc.",
+           "SX 520z Camera",
+       },
+       {
+           USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
+           0,
+           "SmartBridges",
+           "SmartLink USB ethernet adapter",
+       },
+       {
+           USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC,
+           0,
+           "SmartBridges",
+           "smartNIC 2 PnP Adapter",
        },
        {
            USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB,
@@ -5327,6 +6641,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Standard Microsystems",
            "EZ Connect USB Ethernet Adapter",
        },
+       {
+           USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG,
+           0,
+           "Standard Microsystems",
+           "EZ Connect wireless adapter",
+       },
        {
            USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB,
            0,
@@ -5393,6 +6713,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sony",
            "Sony Clie v3.5",
        },
+       {
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_PEG_N760C,
+           0,
+           "Sony",
+           "PEG N760c Memorystick",
+       },
        {
            USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2KEYBOARD,
            0,
@@ -5454,21 +6780,21 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sony Clie nx60",
        },
        {
-           USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25,
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TH55,
            0,
            "Sony",
-           "Sony Clie tj25",
+           "Sony Clie th55",
        },
        {
-           USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
+           USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25,
            0,
-           "Sphairon Access Systems GmbH",
-           "UB801R",
+           "Sony",
+           "Sony Clie tj25",
        },
        {
-           USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10,
+           USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10,
            0,
-           "Susteen",
+           "Sony Ericsson",
            "USB Cable",
        },
        {
@@ -5483,6 +6809,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SOURCENEXT",
            "KeikaiDenwa 8 with charger",
        },
+       {
+           USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
+           0,
+           "Sphairon Access Systems GmbH",
+           "UB801R",
+       },
+       {
+           USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_BIOCPU,
+           0,
+           "STMicroelectronics",
+           "Biometric Coprocessor",
+       },
        {
            USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
            0,
@@ -5538,15 +6876,21 @@ const struct usb_knowndev usb_knowndevs[] = {
            "SUNTAC U-Cable type A4",
        },
        {
-           USB_VENDOR_SUN2, USB_PRODUCT_SUN2_KEYBOARD,
+           USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD_TYPE_6,
            0,
-           "Sun Microsystems (unofficial)",
+           "Sun Microsystems",
            "Type 6 USB keyboard",
        },
        {
-           USB_VENDOR_SUN2, USB_PRODUCT_SUN2_MOUSE,
+           USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD_TYPE_7,
+           0,
+           "Sun Microsystems",
+           "Type 7 USB keyboard",
+       },
+       {
+           USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE,
            0,
-           "Sun Microsystems (unofficial)",
+           "Sun Microsystems",
            "Type 6 USB mouse",
        },
        {
@@ -5564,7 +6908,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10,
            0,
-           "Susteen",
+           "",
            "USB Cable",
        },
        {
@@ -5615,6 +6959,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Tangtop",
            "USBPS2",
        },
+       {
+           USB_VENDOR_TAPWAVE, USB_PRODUCT_TAPWAVE_ZODIAC,
+           0,
+           "Tapwave",
+           "Zodiac",
+       },
        {
            USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,
            0,
@@ -5675,6 +7025,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Telex Communications",
            "Enhanced USB Microphone",
        },
+       {
+           USB_VENDOR_TENX, USB_PRODUCT_TENX_UAUDIO0,
+           0,
+           "Ten X Technology, Inc.",
+           "USB audio headset",
+       },
        {
            USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
            0,
@@ -5705,6 +7061,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Todos Data System",
            "Argos Mini Smartcard Reader",
        },
+       {
+           USB_VENDOR_TOPRE, USB_PRODUCT_TOPRE_HHKB,
+           0,
+           "Topre Corporation",
+           "HHKB Professional",
+       },
        {
            USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740,
            0,
@@ -5717,6 +7079,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Trek Technology",
            "ThumbDrive",
        },
+       {
+           USB_VENDOR_TREK, USB_PRODUCT_TREK_MEMKEY,
+           0,
+           "Trek Technology",
+           "IBM USB Memory Key",
+       },
        {
            USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
            0,
@@ -5729,6 +7097,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Tripp-Lite",
            "U209 Serial adapter",
        },
+       {
+           USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33520,
+           0,
+           "Trumpion Microelectronics",
+           "T33520 USB Flash Card Controller",
+       },
        {
            USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
            0,
@@ -5741,6 +7115,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Trumpion Microelectronics",
            "Comotron C3310 MP3 player",
        },
+       {
+           USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_MP3,
+           0,
+           "Trumpion Microelectronics",
+           "MP3 player",
+       },
        {
            USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000,
            0,
@@ -5795,6 +7175,42 @@ const struct usb_knowndev usb_knowndevs[] = {
            "UMAX Data Systems",
            "Astra 3400 Scanner",
        },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW444UBEU,
+           0,
+           "U-MEDIA Communications",
+           "TEW-444UB EU",
+       },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW444UBEU_NF,
+           0,
+           "U-MEDIA Communications",
+           "TEW-444UB EU (no firmware)",
+       },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A,
+           0,
+           "U-MEDIA Communications",
+           "TEW-429UB_A",
+       },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB,
+           0,
+           "U-MEDIA Communications",
+           "TEW-429UB",
+       },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_2,
+           0,
+           "U-MEDIA Communications",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_2_NF,
+           0,
+           "U-MEDIA Communications",
+           "AR5523 (no firmware)",
+       },
        {
            USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE,
            0,
@@ -5927,6 +7343,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "WACOM",
            "Intuos 9x12 Graphics Tablet",
        },
+       {
+           USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_COMBO,
+           0,
+           "Western Digital",
+           "Firewire USB Combo",
+       },
        {
            USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD,
            0,
@@ -5939,6 +7361,60 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Western Digital",
            "USB HUB",
        },
+       {
+           USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_MYBOOK,
+           0,
+           "Western Digital",
+           "MyBook External HDD",
+       },
+       {
+           USB_VENDOR_WINBOND, USB_PRODUCT_WINBOND_UH104,
+           0,
+           "Winbond Electronics",
+           "4-port USB Hub",
+       },
+       {
+           USB_VENDOR_WINMAXGROUP, USB_PRODUCT_WINMAXGROUP_FLASH64MC,
+           0,
+           "WinMaxGroup",
+           "USB Flash Disk 64M-C",
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G,
+           0,
+           "Wistron NeWeb",
+           "UR055G",
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1,
+           0,
+           "Wistron NeWeb",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF,
+           0,
+           "Wistron NeWeb",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2,
+           0,
+           "Wistron NeWeb",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF,
+           0,
+           "Wistron NeWeb",
+           "AR5523 (no firmware)",
+       },
+       {
+           USB_VENDOR_XEROX, USB_PRODUCT_XEROX_WCM15,
+           0,
+           "Xerox",
+           "WorkCenter M15",
+       },
        {
            USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
            0,
@@ -6071,6 +7547,42 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Yano",
            "U640MO-03",
        },
+       {
+           USB_VENDOR_YANO, USB_PRODUCT_YANO_FW800HD,
+           0,
+           "Yano",
+           "METALWEAR-HDD",
+       },
+       {
+           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_ZCOM, USB_PRODUCT_ZCOM_AR5523,
+           0,
+           "Z-Com",
+           "AR5523",
+       },
+       {
+           USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_AR5523_NF,
+           0,
+           "Z-Com",
+           "AR5523 driver (no firmware)",
+       },
        {
            USB_VENDOR_ZEEVO, USB_PRODUCT_ZEEVO_BLUETOOTH,
            0,
@@ -6107,18 +7619,42 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ZyXEL Communication",
            "Scorpion-980N keyboard",
        },
+       {
+           USB_VENDOR_UNKNOWN1, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Unknown vendor",
+           NULL,
+       },
+       {
+           USB_VENDOR_UNKNOWN2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Unknown vendor",
+           NULL,
+       },
        {
            USB_VENDOR_EGALAX2, 0,
            USB_KNOWNDEV_NOPROD,
            "eGalax, Inc.",
            NULL,
        },
+       {
+           USB_VENDOR_HUMAX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "HUMAX",
+           NULL,
+       },
        {
            USB_VENDOR_LTS, 0,
            USB_KNOWNDEV_NOPROD,
            "LTS",
            NULL,
        },
+       {
+           USB_VENDOR_BWCT, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Bernd Walter Computer Technology",
+           NULL,
+       },
        {
            USB_VENDOR_AOX, 0,
            USB_KNOWNDEV_NOPROD,
@@ -6323,6 +7859,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Melco",
            NULL,
        },
+       {
+           USB_VENDOR_LEADTEK, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Leadtek",
+           NULL,
+       },
        {
            USB_VENDOR_WINBOND, 0,
            USB_KNOWNDEV_NOPROD,
@@ -6396,9 +7938,9 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_SUN2, 0,
+           USB_VENDOR_SUN, 0,
            USB_KNOWNDEV_NOPROD,
-           "Sun Microsystems (unofficial)",
+           "Sun Microsystems",
            NULL,
        },
        {
@@ -6552,9 +8094,9 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_SUN, 0,
+           USB_VENDOR_SUN2, 0,
            USB_KNOWNDEV_NOPROD,
-           "Sun Microsystems (offical)",
+           "Sun Microsystems (official)",
            NULL,
        },
        {
@@ -6602,7 +8144,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_KYOCERA, 0,
            USB_KNOWNDEV_NOPROD,
-           "Kyocera",
+           "Kyocera Wireless Corp.",
            NULL,
        },
        {
@@ -6641,6 +8183,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Acer Peripherals",
            NULL,
        },
+       {
+           USB_VENDOR_DAVICOM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Davicom",
+           NULL,
+       },
        {
            USB_VENDOR_VISIONEER, 0,
            USB_KNOWNDEV_NOPROD,
@@ -6827,10 +8375,16 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Mentor Graphics",
            NULL,
        },
+       {
+           USB_VENDOR_ITUNERNET, 0,
+           USB_KNOWNDEV_NOPROD,
+           "I-Tuner Networks",
+           NULL,
+       },
        {
            USB_VENDOR_HOLTEK, 0,
            USB_KNOWNDEV_NOPROD,
-           "Holtek Semiconductor",
+           "Holtek Semiconductor, Inc.",
            NULL,
        },
        {
@@ -6962,7 +8516,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_HOSIDEN, 0,
            USB_KNOWNDEV_NOPROD,
-           "Hosiden",
+           "Hosiden Corporation",
            NULL,
        },
        {
@@ -7151,6 +8705,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ATEN International",
            NULL,
        },
+       {
+           USB_VENDOR_SAMSUNG2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Samsung Electronics",
+           NULL,
+       },
        {
            USB_VENDOR_MUSTEK, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7295,6 +8855,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "OMRON",
            NULL,
        },
+       {
+           USB_VENDOR_ZORAN, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Zoran Microelectronics",
+           NULL,
+       },
        {
            USB_VENDOR_NIIGATA, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7601,12 +9167,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Apex",
            NULL,
        },
+       {
+           USB_VENDOR_CREATIVE3, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Creative Labs",
+           NULL,
+       },
        {
            USB_VENDOR_VIVITAR, 0,
            USB_KNOWNDEV_NOPROD,
            "Vivitar",
            NULL,
        },
+       {
+           USB_VENDOR_GUNZE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Gunze Electronics USA",
+           NULL,
+       },
        {
            USB_VENDOR_AVISION, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7649,6 +9227,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sigmatel",
            NULL,
        },
+       {
+           USB_VENDOR_DRAYTEK, 0,
+           USB_KNOWNDEV_NOPROD,
+           "DrayTek",
+           NULL,
+       },
        {
            USB_VENDOR_AIWA, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7680,9 +9264,9 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_HAGIWARA, 0,
+           USB_VENDOR_SIEMENS2, 0,
            USB_KNOWNDEV_NOPROD,
-           "Hagiwara Sys-Com",
+           "Siemens",
            NULL,
        },
        {
@@ -7697,6 +9281,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CH Products",
            NULL,
        },
+       {
+           USB_VENDOR_HAGIWARA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Hagiwara Sys-Com",
+           NULL,
+       },
        {
            USB_VENDOR_CTX, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7742,7 +9332,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_KEYSPAN, 0,
            USB_KNOWNDEV_NOPROD,
-           "Keyspan",
+           "Keyspan / InnoSys Inc.",
            NULL,
        },
        {
@@ -7811,12 +9401,6 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Imation",
            NULL,
        },
-       {
-           USB_VENDOR_SUSTEEN, 0,
-           USB_KNOWNDEV_NOPROD,
-           "Susteen",
-           NULL,
-       },
        {
            USB_VENDOR_SONYERICSSON, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7829,6 +9413,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Eicon Networks",
            NULL,
        },
+       {
+           USB_VENDOR_SYNTECH, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Syntech Information",
+           NULL,
+       },
        {
            USB_VENDOR_DIGITALSTREAM, 0,
            USB_KNOWNDEV_NOPROD,
@@ -7901,6 +9491,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ABL Electronics",
            NULL,
        },
+       {
+           USB_VENDOR_SAGEM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Sagem",
+           NULL,
+       },
        {
            USB_VENDOR_SUNCOMM, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8051,12 +9647,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "STSN",
            NULL,
        },
+       {
+           USB_VENDOR_CENTURY, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Century Corp",
+           NULL,
+       },
        {
            USB_VENDOR_ZOOM, 0,
            USB_KNOWNDEV_NOPROD,
            "Zoom Telephonics",
            NULL,
        },
+       {
+           USB_VENDOR_PCS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Personal Communication Systems",
+           NULL,
+       },
        {
            USB_VENDOR_BROADLOGIC, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8111,6 +9719,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "BayNETGEAR",
            NULL,
        },
+       {
+           USB_VENDOR_TOPRE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Topre Corporation",
+           NULL,
+       },
        {
            USB_VENDOR_ACTIVEWIRE, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8237,6 +9851,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Trumpion Microelectronics",
            NULL,
        },
+       {
+           USB_VENDOR_FEIYA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Feiya",
+           NULL,
+       },
        {
            USB_VENDOR_ALATION, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8249,12 +9869,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Concord Camera",
            NULL,
        },
+       {
+           USB_VENDOR_GARMIN, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Garmin International",
+           NULL,
+       },
        {
            USB_VENDOR_GOHUBS, 0,
            USB_KNOWNDEV_NOPROD,
            "GoHubs",
            NULL,
        },
+       {
+           USB_VENDOR_XEROX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Xerox",
+           NULL,
+       },
        {
            USB_VENDOR_BIOMETRIC, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8303,6 +9935,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Agilent Technologies",
            NULL,
        },
+       {
+           USB_VENDOR_GUDE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Gude ADS",
+           NULL,
+       },
        {
            USB_VENDOR_PORTSMITH, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8369,6 +10007,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ACTiSYS",
            NULL,
        },
+       {
+           USB_VENDOR_NOVATEL2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Novatel Wireless",
+           NULL,
+       },
        {
            USB_VENDOR_AFOURTECH, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8435,6 +10079,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Boca Systems",
            NULL,
        },
+       {
+           USB_VENDOR_SHANTOU, 0,
+           USB_KNOWNDEV_NOPROD,
+           "ShanTou",
+           NULL,
+       },
        {
            USB_VENDOR_MEDIAGEAR, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8459,6 +10109,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Geocast Network Systems",
            NULL,
        },
+       {
+           USB_VENDOR_IDQUANTIQUE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "id Quantique",
+           NULL,
+       },
+       {
+           USB_VENDOR_ZYDAS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Zydas Technology Corporation",
+           NULL,
+       },
        {
            USB_VENDOR_NEODIO, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8474,7 +10136,7 @@ const struct usb_knowndev usb_knowndevs[] = {
        {
            USB_VENDOR_ASUS, 0,
            USB_KNOWNDEV_NOPROD,
-           "ASUS",
+           "ASUSTeK Computer",
            NULL,
        },
        {
@@ -8537,12 +10199,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ASIX Electronics",
            NULL,
        },
+       {
+           USB_VENDOR_O2MICRO, 0,
+           USB_KNOWNDEV_NOPROD,
+           "O2 Micro, Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_USR, 0,
            USB_KNOWNDEV_NOPROD,
            "U.S. Robotics",
            NULL,
        },
+       {
+           USB_VENDOR_AMBIT, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Ambit Microsystems",
+           NULL,
+       },
        {
            USB_VENDOR_REALTEK, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8585,12 +10259,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "EasyDisk",
            NULL,
        },
+       {
+           USB_VENDOR_KYOCERA2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Kyocera Wireless Corp.",
+           NULL,
+       },
        {
            USB_VENDOR_ZCOM, 0,
            USB_KNOWNDEV_NOPROD,
            "Z-Com",
            NULL,
        },
+       {
+           USB_VENDOR_ATHEROS2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Atheros Communications",
+           NULL,
+       },
        {
            USB_VENDOR_TANGTOP, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8609,12 +10295,6 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Pen Drive",
            NULL,
        },
-       {
-           USB_VENDOR_PNY, 0,
-           USB_KNOWNDEV_NOPROD,
-           "PNY",
-           NULL,
-       },
        {
            USB_VENDOR_ACDC, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8627,10 +10307,34 @@ const struct usb_knowndev usb_knowndevs[] = {
            "ABC",
            NULL,
        },
+       {
+           USB_VENDOR_CONCEPTRONIC, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Conceptronic",
+           NULL,
+       },
+       {
+           USB_VENDOR_SKANHEX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Skanhex Technology, Inc.",
+           NULL,
+       },
        {
            USB_VENDOR_MSI, 0,
            USB_KNOWNDEV_NOPROD,
-           "Micro Star",
+           "Micro Star International",
+           NULL,
+       },
+       {
+           USB_VENDOR_ELCON, 0,
+           USB_KNOWNDEV_NOPROD,
+           "ELCON Systemtechnik",
+           NULL,
+       },
+       {
+           USB_VENDOR_NETAC, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Netac",
            NULL,
        },
        {
@@ -8639,18 +10343,48 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sitecom Europe",
            NULL,
        },
+       {
+           USB_VENDOR_MOBILEACTION, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Mobile Action",
+           NULL,
+       },
+       {
+           USB_VENDOR_SPEEDDRAGON, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Speed Dragon Multimedia",
+           NULL,
+       },
        {
            USB_VENDOR_HAWKING, 0,
            USB_KNOWNDEV_NOPROD,
            "Hawking",
            NULL,
        },
+       {
+           USB_VENDOR_FOSSIL, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Fossil, Inc",
+           NULL,
+       },
+       {
+           USB_VENDOR_GMATE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "G.Mate, Inc",
+           NULL,
+       },
        {
            USB_VENDOR_OTI, 0,
            USB_KNOWNDEV_NOPROD,
            "Ours Technology",
            NULL,
        },
+       {
+           USB_VENDOR_PILOTECH, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Pilotech",
+           NULL,
+       },
        {
            USB_VENDOR_NOVATECH, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8658,15 +10392,33 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_PILOTECH, 0,
+           USB_VENDOR_ITEGNO, 0,
            USB_KNOWNDEV_NOPROD,
-           "Pilotech",
+           "iTegno",
+           NULL,
+       },
+       {
+           USB_VENDOR_WINMAXGROUP, 0,
+           USB_KNOWNDEV_NOPROD,
+           "WinMaxGroup",
+           NULL,
+       },
+       {
+           USB_VENDOR_TOD, 0,
+           USB_KNOWNDEV_NOPROD,
+           "TOD",
            NULL,
        },
        {
            USB_VENDOR_EGALAX, 0,
            USB_KNOWNDEV_NOPROD,
-           "eGalax",
+           "eGalax, Inc.",
+           NULL,
+       },
+       {
+           USB_VENDOR_AIRPRIME, 0,
+           USB_KNOWNDEV_NOPROD,
+           "AirPrime, Inc.",
            NULL,
        },
        {
@@ -8681,12 +10433,36 @@ const struct usb_knowndev usb_knowndevs[] = {
            "VTech",
            NULL,
        },
+       {
+           USB_VENDOR_FALCOM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Falcom Wireless Communications GmbH",
+           NULL,
+       },
+       {
+           USB_VENDOR_RIM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Research In Motion",
+           NULL,
+       },
+       {
+           USB_VENDOR_DYNASTREAM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Dynastream Innovations",
+           NULL,
+       },
        {
            USB_VENDOR_QUALCOMM2, 0,
            USB_KNOWNDEV_NOPROD,
            "Qualcomm",
            NULL,
        },
+       {
+           USB_VENDOR_DESKNOTE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Desknote",
+           NULL,
+       },
        {
            USB_VENDOR_GIGABYTE, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8711,6 +10487,24 @@ const struct usb_knowndev usb_knowndevs[] = {
            "CCYU Technology",
            NULL,
        },
+       {
+           USB_VENDOR_CURITEL, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Curitel Communications Inc",
+           NULL,
+       },
+       {
+           USB_VENDOR_SILABS2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "SILABS2",
+           NULL,
+       },
+       {
+           USB_VENDOR_USI, 0,
+           USB_KNOWNDEV_NOPROD,
+           "USI",
+           NULL,
+       },
        {
            USB_VENDOR_PLX, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8723,6 +10517,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Asante",
            NULL,
        },
+       {
+           USB_VENDOR_SILABS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Silicon Labs",
+           NULL,
+       },
+       {
+           USB_VENDOR_ANALOG, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Analog Devices",
+           NULL,
+       },
+       {
+           USB_VENDOR_TENX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Ten X Technology, Inc.",
+           NULL,
+       },
+       {
+           USB_VENDOR_ISSC, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Integrated System Solution Corp.",
+           NULL,
+       },
        {
            USB_VENDOR_JRC, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8753,24 +10571,72 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Acer Communications & Multimedia",
            NULL,
        },
+       {
+           USB_VENDOR_SIERRA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Sierra Wireless",
+           NULL,
+       },
+       {
+           USB_VENDOR_TOPFIELD, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Topfield Co., Ltd",
+           NULL,
+       },
+       {
+           USB_VENDOR_SIEMENS3, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Siemens",
+           NULL,
+       },
        {
            USB_VENDOR_PROLIFIC2, 0,
            USB_KNOWNDEV_NOPROD,
            "Prolific",
            NULL,
        },
+       {
+           USB_VENDOR_ALCATEL, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Alcatel",
+           NULL,
+       },
+       {
+           USB_VENDOR_UNKNOWN3, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Unknown vendor",
+           NULL,
+       },
        {
            USB_VENDOR_TSUNAMI, 0,
            USB_KNOWNDEV_NOPROD,
            "Tsunami",
            NULL,
        },
+       {
+           USB_VENDOR_PHEENET, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Pheenet",
+           NULL,
+       },
+       {
+           USB_VENDOR_TARGUS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Targus",
+           NULL,
+       },
        {
            USB_VENDOR_TWINMOS, 0,
            USB_KNOWNDEV_NOPROD,
            "TwinMOS",
            NULL,
        },
+       {
+           USB_VENDOR_TENDA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Tenda",
+           NULL,
+       },
        {
            USB_VENDOR_CREATIVE2, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8783,6 +10649,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Belkin Components",
            NULL,
        },
+       {
+           USB_VENDOR_CYBERTAN, 0,
+           USB_KNOWNDEV_NOPROD,
+           "CyberTAN Technology",
+           NULL,
+       },
+       {
+           USB_VENDOR_HUAWEI, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Huawei Technologies",
+           NULL,
+       },
+       {
+           USB_VENDOR_ARANEUS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Araneus Information Systems",
+           NULL,
+       },
+       {
+           USB_VENDOR_TAPWAVE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Tapwave",
+           NULL,
+       },
        {
            USB_VENDOR_AINCOMM, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8802,9 +10692,21 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_LINKSYS4, 0,
+           USB_VENDOR_NETGEAR3, 0,
            USB_KNOWNDEV_NOPROD,
-           "Linksys",
+           "Netgear",
+           NULL,
+       },
+       {
+           USB_VENDOR_BALTECH, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Baltech",
+           NULL,
+       },
+       {
+           USB_VENDOR_CISCOLINKSYS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Cisco-Linksys",
            NULL,
        },
        {
@@ -8813,6 +10715,18 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Shark",
            NULL,
        },
+       {
+           USB_VENDOR_NOVATEL, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Novatel Wireless",
+           NULL,
+       },
+       {
+           USB_VENDOR_WISTRONNEWEB, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Wistron NeWeb",
+           NULL,
+       },
        {
            USB_VENDOR_RADIOSHACK, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8844,17 +10758,59 @@ const struct usb_knowndev usb_knowndevs[] = {
            NULL,
        },
        {
-           USB_VENDOR_CONCEPTRONIC, 0,
+           USB_VENDOR_CONCEPTRONIC2, 0,
            USB_KNOWNDEV_NOPROD,
            "Conceptronic",
            NULL,
        },
+       {
+           USB_VENDOR_PLANEX3, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Planex Communications",
+           NULL,
+       },
        {
            USB_VENDOR_SILICONPORTALS, 0,
            USB_KNOWNDEV_NOPROD,
            "Silicon Portals",
            NULL,
        },
+       {
+           USB_VENDOR_UBIQUAM, 0,
+           USB_KNOWNDEV_NOPROD,
+           "UBIQUAM Co., Ltd.",
+           NULL,
+       },
+       {
+           USB_VENDOR_UBLOX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "U-blox",
+           NULL,
+       },
+       {
+           USB_VENDOR_PNY, 0,
+           USB_KNOWNDEV_NOPROD,
+           "PNY",
+           NULL,
+       },
+       {
+           USB_VENDOR_OQO, 0,
+           USB_KNOWNDEV_NOPROD,
+           "OQO",
+           NULL,
+       },
+       {
+           USB_VENDOR_UMEDIA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "U-MEDIA Communications",
+           NULL,
+       },
+       {
+           USB_VENDOR_FIBERLINE, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Fiberline",
+           NULL,
+       },
        {
            USB_VENDOR_SOHOWARE, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8891,12 +10847,60 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Actiontec Electronics",
            NULL,
        },
+       {
+           USB_VENDOR_ATHEROS, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Atheros Communications",
+           NULL,
+       },
        {
            USB_VENDOR_GIGASET, 0,
            USB_KNOWNDEV_NOPROD,
            "Gigaset",
            NULL,
        },
+       {
+           USB_VENDOR_GLOBALSUN, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Global Sun Technology",
+           NULL,
+       },
+       {
+           USB_VENDOR_ANYDATA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "AnyDATA Corporation",
+           NULL,
+       },
+       {
+           USB_VENDOR_JABLOTRON, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Jablotron",
+           NULL,
+       },
+       {
+           USB_VENDOR_CMOTECH, 0,
+           USB_KNOWNDEV_NOPROD,
+           "CMOTECH Co., Ltd.",
+           NULL,
+       },
+       {
+           USB_VENDOR_LINKSYS4, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Linksys",
+           NULL,
+       },
+       {
+           USB_VENDOR_SENAO, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Senao",
+           NULL,
+       },
+       {
+           USB_VENDOR_METAGEEK, 0,
+           USB_KNOWNDEV_NOPROD,
+           "MetaGeek",
+           NULL,
+       },
        {
            USB_VENDOR_AMIT, 0,
            USB_KNOWNDEV_NOPROD,
@@ -8975,6 +10979,12 @@ const struct usb_knowndev usb_knowndevs[] = {
            "AEI",
            NULL,
        },
+       {
+           USB_VENDOR_HANK, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Hank Connection",
+           NULL,
+       },
        {
            USB_VENDOR_PQI, 0,
            USB_KNOWNDEV_NOPROD,
@@ -9017,12 +11027,30 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Dell",
            NULL,
        },
+       {
+           USB_VENDOR_WCH, 0,
+           USB_KNOWNDEV_NOPROD,
+           "QinHeng Electronics",
+           NULL,
+       },
+       {
+           USB_VENDOR_ACEECA, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Aceeca",
+           NULL,
+       },
        {
            USB_VENDOR_AVERATEC, 0,
            USB_KNOWNDEV_NOPROD,
            "Averatec",
            NULL,
        },
+       {
+           USB_VENDOR_SWEEX, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Sweex",
+           NULL,
+       },
        {
            USB_VENDOR_ONSPEC2, 0,
            USB_KNOWNDEV_NOPROD,
@@ -9041,17 +11069,53 @@ const struct usb_knowndev usb_knowndevs[] = {
            "Sitecom",
            NULL,
        },
+       {
+           USB_VENDOR_ARKMICRO, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Arkmicro Technologies Inc.",
+           NULL,
+       },
+       {
+           USB_VENDOR_3COM2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "3Com",
+           NULL,
+       },
        {
            USB_VENDOR_INTEL, 0,
            USB_KNOWNDEV_NOPROD,
            "Intel",
            NULL,
        },
+       {
+           USB_VENDOR_SITECOM2, 0,
+           USB_KNOWNDEV_NOPROD,
+           "Sitecom",
+           NULL,
+       },
+       {
+           USB_VENDOR_MOSCHIP, 0,
+           USB_KNOWNDEV_NOPROD,
+           "MosChip Semiconductor",
+           NULL,
+       },
+       {
+           USB_VENDOR_3COM3, 0,
+           USB_KNOWNDEV_NOPROD,
+           "3Com",
+           NULL,
+       },
        {
            USB_VENDOR_HP2, 0,
            USB_KNOWNDEV_NOPROD,
            "Hewlett Packard",
            NULL,
        },
+       {
+           USB_VENDOR_USRP, 0,
+           USB_KNOWNDEV_NOPROD,
+           "GNU Radio USRP",
+           NULL,
+       },
        { 0, 0, 0, NULL, NULL, }
 };
index 789ef8e..a574c06 100644 (file)
@@ -1,5 +1,5 @@
 /*     $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $      */
-/*     $DragonFly: src/sys/dev/netif/rum/if_rum.c,v 1.17 2007/07/02 23:52:04 hasso Exp $       */
+/*     $DragonFly: src/sys/dev/netif/rum/if_rum.c,v 1.18 2007/07/27 18:07:21 hasso Exp $       */
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -71,9 +71,9 @@ int rum_debug = 0;
 /* various supported device vendors/products */
 static const struct usb_devno rum_devs[] = {
        { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_HWU54DM },
-       { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_RT2573 },
-       { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_RT2573_1 },
        { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_RT2573_2 },
+       { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_RT2573_3 },
+       { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_RT2573_4 },
        { USB_VENDOR_ABOCOM,            USB_PRODUCT_ABOCOM_WUG2700 },
        { USB_VENDOR_AMIT,              USB_PRODUCT_AMIT_CGWLUSB2GO },
        { USB_VENDOR_ASUS,              USB_PRODUCT_ASUS_WL167G_2 },
@@ -82,7 +82,7 @@ static const struct usb_devno rum_devs[] = {
        { USB_VENDOR_BELKIN,            USB_PRODUCT_BELKIN_F5D9050V3 },
        { USB_VENDOR_LINKSYS4,          USB_PRODUCT_LINKSYS4_WUSB54GC },
        { USB_VENDOR_LINKSYS4,          USB_PRODUCT_LINKSYS4_WUSB54GR },
-       { USB_VENDOR_CONCEPTRONIC,      USB_PRODUCT_CONCEPTRONIC_C54RU2 },
+       { USB_VENDOR_CONCEPTRONIC2,     USB_PRODUCT_CONCEPTRONIC2_C54RU2 },
        { USB_VENDOR_DICKSMITH,         USB_PRODUCT_DICKSMITH_CWD854F },
        { USB_VENDOR_DICKSMITH,         USB_PRODUCT_DICKSMITH_RT2573 },
        { USB_VENDOR_DLINK2,            USB_PRODUCT_DLINK2_DWLG122C1 },
@@ -96,10 +96,10 @@ static const struct usb_devno rum_devs[] = {
        { USB_VENDOR_HUAWEI3COM,        USB_PRODUCT_HUAWEI3COM_RT2573 },
        { USB_VENDOR_MELCO,             USB_PRODUCT_MELCO_G54HP },
        { USB_VENDOR_MELCO,             USB_PRODUCT_MELCO_SG54HP },
-       { USB_VENDOR_MSI,               USB_PRODUCT_MSI_RT2573 },
        { USB_VENDOR_MSI,               USB_PRODUCT_MSI_RT2573_1 },
        { USB_VENDOR_MSI,               USB_PRODUCT_MSI_RT2573_2 },
        { USB_VENDOR_MSI,               USB_PRODUCT_MSI_RT2573_3 },
+       { USB_VENDOR_MSI,               USB_PRODUCT_MSI_RT2573_4 },
        { USB_VENDOR_NOVATECH,          USB_PRODUCT_NOVATECH_RT2573 },
        { USB_VENDOR_PLANEX2,           USB_PRODUCT_PLANEX2_GWUS54HP },
        { USB_VENDOR_PLANEX2,           USB_PRODUCT_PLANEX2_GWUS54MINI2 },
index 8097a35..d002743 100644 (file)
@@ -1,5 +1,5 @@
 /*     $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.10.2.8 2006/07/08 07:48:43 maxim Exp $  */
-/*     $DragonFly: src/sys/dev/netif/ural/if_ural.c,v 1.18 2007/07/16 11:21:49 sephe Exp $     */
+/*     $DragonFly: src/sys/dev/netif/ural/if_ural.c,v 1.19 2007/07/27 18:07:21 hasso Exp $     */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -75,7 +75,7 @@ static const struct usb_devno ural_devs[] = {
        { USB_VENDOR_ASUS,              USB_PRODUCT_ASUS_WL167G },
        { USB_VENDOR_ASUS,              USB_PRODUCT_RALINK_RT2570 },
        { USB_VENDOR_BELKIN,            USB_PRODUCT_BELKIN_F5D7050 },
-       { USB_VENDOR_CONCEPTRONIC,      USB_PRODUCT_CONCEPTRONIC_C54U },
+       { USB_VENDOR_CONCEPTRONIC2,     USB_PRODUCT_CONCEPTRONIC2_C54RU },
        { USB_VENDOR_DLINK,             USB_PRODUCT_DLINK_DWLG122 },
        { USB_VENDOR_GIGABYTE,          USB_PRODUCT_GIGABYTE_GNWBKG },
        { USB_VENDOR_GUILLEMOT,         USB_PRODUCT_GUILLEMOT_HWGUSB254 },
index 2d78802..e476619 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $
  * $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.39 2006/09/07 00:06:42 imp Exp $
- * $DragonFly: src/sys/dev/usbmisc/uplcom/uplcom.c,v 1.15 2007/07/03 19:28:16 hasso Exp $
+ * $DragonFly: src/sys/dev/usbmisc/uplcom/uplcom.c,v 1.16 2007/07/27 18:07:21 hasso Exp $
  */
 
 /*-
@@ -249,7 +249,7 @@ static const struct uplcom_product {
        { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, -1, TYPE_PL2303 },
        { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0, -1, TYPE_PL2303 },
        /* Sony Ericsson USB Cable */
-       { USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10,
+       { USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10,
          -1,TYPE_PL2303 },
        /* SOURCENEXT KeikaiDenwa 8 */
        { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8,