Module Name:    src
Committed By:   nonaka
Date:           Tue May 29 19:49:10 UTC 2012

Modified Files:
        src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.609 -r1.610 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.610 -r1.611 src/sys/dev/usb/usbdevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.609 src/sys/dev/usb/usbdevs.h:1.610
--- src/sys/dev/usb/usbdevs.h:1.609	Tue May 29 14:05:01 2012
+++ src/sys/dev/usb/usbdevs.h	Tue May 29 19:49:10 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.609 2012/05/29 14:05:01 christos Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.610 2012/05/29 19:49:10 nonaka Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp
+ *	NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp
  */
 
 /*
@@ -202,6 +202,7 @@
 #define	USB_VENDOR_ATREND	0x059c		/* A-Trend Technology */
 #define	USB_VENDOR_AID	0x059d		/* Advanced Input Devices */
 #define	USB_VENDOR_LACIE	0x059f		/* LaCie */
+#define	USB_VENDOR_CISCOLINKSYS3	0x05a6		/* Cisco-Linksys */
 #define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
@@ -314,6 +315,7 @@
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
 #define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable */
 #define	USB_VENDOR_STSN	0x07ef		/* STSN */
+#define	USB_VENDOR_BEWAN	0x07fa		/* Bewan */
 #define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
@@ -443,7 +445,9 @@
 #define	USB_VENDOR_RIM	0x0fca		/* Research In Motion */
 #define	USB_VENDOR_DYNASTREAM	0x0fcf		/* Dynastream Innovations */
 #define	USB_VENDOR_SUNRISING	0x0fe6		/* SUNRISING */
+#define	USB_VENDOR_DVICO	0x0fe9		/* DViCO */
 #define	USB_VENDOR_QUALCOMM	0x1004		/* Qualcomm */
+#define	USB_VENDOR_MOTOROLA4	0x100d		/* Motorola */
 #define	USB_VENDOR_HP3	0x103c		/* Hewlett Packard */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
@@ -505,6 +509,7 @@
 #define	USB_VENDOR_GOODWAY	0x1631		/* Good Way Technology */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_CISCOLINKSYS2	0x167b		/* Cisco-Linksys */
 #define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
@@ -524,6 +529,7 @@
 #define	USB_VENDOR_QUANTA	0x1a32		/* Quanta */
 #define	USB_VENDOR_TERMINUS	0x1a40		/* Terminus Technology */
 #define	USB_VENDOR_WINCHIPHEAD2	0x1a86		/* QinHeng Electronics */
+#define	USB_VENDOR_OVISLINK	0x1b75		/* OvisLink */
 #define	USB_VENDOR_MPMAN	0x1cae		/* MPMan */
 #define	USB_VENDOR_4GSYSTEMS	0x1c9e		/* 4G Systems */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
@@ -532,6 +538,7 @@
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
 #define	USB_VENDOR_ENCORE	0x203d		/* Encore */
 #define	USB_VENDOR_HAUPPAUGE2	0x2040		/* Hauppauge Computer Works */
+#define	USB_VENDOR_PARA	0x20b8		/* PARA Industrial */
 #define	USB_VENDOR_TRENDNET	0x20f4		/* TRENDnet */
 #define	USB_VENDOR_DLINK3	0x2101		/* D-Link */
 #define	USB_VENDOR_ERICSSON	0x2282		/* Ericsson */
@@ -563,6 +570,7 @@
 #define	USB_VENDOR_3COM2	0x6891		/* 3Com */
 #define	USB_VENDOR_EDIMAX	0x7392		/* EDIMAX */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
+#define	USB_VENDOR_ALLWIN	0x8516		/* ALLWIN Tech */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip Semiconductor */
 #define	USB_VENDOR_xxFTDI	0x9e88		/* FTDI */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
@@ -646,6 +654,7 @@
 #define	USB_PRODUCT_ACCTON_RT2870_4	0xa618		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_RT3070_1	0xa701		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT3070_2	0xa702		/* RT3070 */
+#define	USB_PRODUCT_ACCTON_RT3070_6	0xa703		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT2870_1	0xb522		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_RT3070_3	0xc522		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT3070_5	0xd522		/* RT3070 */
@@ -731,6 +740,7 @@
 #define	USB_PRODUCT_AIRPRIME_PC5220	0x0112		/* CDMA Wireless PC Card */
 
 /* Airties products */
+#define	USB_PRODUCT_AIRTIES_RT3070_2	0x2012		/* RT3070 */
 #define	USB_PRODUCT_AIRTIES_RT3070	0x2310		/* RT3070 */
 
 /* AKS products */
@@ -748,6 +758,15 @@
 #define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan Keyboard */
 #define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
 
+/* ALLWIN Tech products */
+#define	USB_PRODUCT_ALLWIN_RT2070	0x2070		/* RT2070 */
+#define	USB_PRODUCT_ALLWIN_RT2770	0x2770		/* RT2770 */
+#define	USB_PRODUCT_ALLWIN_RT2870	0x2870		/* RT2870 */
+#define	USB_PRODUCT_ALLWIN_RT3070	0x3070		/* RT3070 */
+#define	USB_PRODUCT_ALLWIN_RT3071	0x3071		/* RT3071 */
+#define	USB_PRODUCT_ALLWIN_RT3072	0x3072		/* RT3072 */
+#define	USB_PRODUCT_ALLWIN_RT3572	0x3572		/* RT3572 */
+
 /* Altec Lansing products */
 #define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
@@ -848,6 +867,8 @@
 #define	USB_PRODUCT_ASUSTEK_RT2870_3	0x1742		/* RT2870 */
 #define	USB_PRODUCT_ASUSTEK_RT2870_4	0x1760		/* RT2870 */
 #define	USB_PRODUCT_ASUSTEK_RT2870_5	0x1761		/* RT2870 */
+#define	USB_PRODUCT_ASUSTEK_RT3070	0x1784		/* RT3070 */
+#define	USB_PRODUCT_ASUSTEK_RT3070_1	0x1790		/* RT3070 */
 #define	USB_PRODUCT_ASUSTEK_MYPAL_A730	0x4202		/* MyPal A730 */
 #define	USB_PRODUCT_ASUSTEK2_USBN11	0x0b05		/* USB-N11 */
 
@@ -907,6 +928,10 @@
 #define	USB_PRODUCT_AZUREWAVE_RT2870_1	0x3247		/* RT2870 */
 #define	USB_PRODUCT_AZUREWAVE_RT2870_2	0x3262		/* RT2870 */
 #define	USB_PRODUCT_AZUREWAVE_RT3070	0x3273		/* RT3070 */
+#define	USB_PRODUCT_AZUREWAVE_RT3070_2	0x3284		/* RT3070 */
+#define	USB_PRODUCT_AZUREWAVE_RT3070_3	0x3305		/* RT3070 */
+#define	USB_PRODUCT_AZUREWAVE_RT3070_4	0x3307		/* RT3070 */
+#define	USB_PRODUCT_AZUREWAVE_RT3070_5	0x3321		/* RT3070 */
 #define	USB_PRODUCT_AZUREWAVE_RTL8188CE_1	0x3358		/* RTL8188CE */
 #define	USB_PRODUCT_AZUREWAVE_RTL8188CE_2	0x3359		/* RTL8188CE */
 
@@ -941,8 +966,15 @@
 #define	USB_PRODUCT_BELKIN_RT2870_2	0x805c		/* RT2870 */
 #define	USB_PRODUCT_BELKIN_F5D8053V3	0x815c		/* F5D8053 v3 */
 #define	USB_PRODUCT_BELKIN_F5D8055	0x825a		/* F5D8055 */
+#define	USB_PRODUCT_BELKIN_F5D8055V2	0x825b		/* F5D8055 v2 */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 */
 #define	USB_PRODUCT_BELKIN_F6D4050V1	0x935a		/* F6D4050 ver 1 */
+#define	USB_PRODUCT_BELKIN_F6D4050V2	0x935b		/* F6D4050 ver 2 */
+#define	USB_PRODUCT_BELKIN_F7D1101V2	0x945b		/* F7D1101 v2 */
+
+/* Bewan products */
+#define	USB_PRODUCT_BEWAN_BWIFI_USB54AR	0x1196		/* BWIFI-USB54AR */
+#define	USB_PRODUCT_BEWAN_RT3070	0x7712		/* RT3070 */
 
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
@@ -1023,6 +1055,10 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GC	0x0020		/* WUSB54GC */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
+#define	USB_PRODUCT_CISCOLINKSYS_AE1000	0x002f		/* AE1000 */
+#define	USB_PRODUCT_CISCOLINKSYS_AM10	0x0031		/* AM10 */
+#define	USB_PRODUCT_CISCOLINKSYS2_RT3070	0x4001		/* RT3070 */
+#define	USB_PRODUCT_CISCOLINKSYS3_RT3070	0x0101		/* RT3070 */
 
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_IPAQPOCKETPC	0x0003		/* iPAQ PocketPC */
@@ -1041,13 +1077,17 @@
 #define	USB_PRODUCT_CONCEPTRONIC_C54RU	0x3c02		/* C54RU WLAN */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_1	0x3c06		/* RT2870 */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_2	0x3c07		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT3070_1	0x3c08		/* RT3070 */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_7	0x3c09		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT3070_2	0x3c11		/* RT3070 */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_8	0x3c12		/* RT2870 */
 #define	USB_PRODUCT_CONCEPTRONIC_C54RU2	0x3c22		/* C54RU */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_3	0x3c23		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT2573	0x3c24		/* RT2573M */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_4	0x3c25		/* RT2870 */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_5	0x3c27		/* RT2870 */
 #define	USB_PRODUCT_CONCEPTRONIC_RT2870_6	0x3c28		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT3070_3	0x3c2c		/* RT3070 */
 
 /* Concord Camera products */
 #define	USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X	0x0100		/* Eye Q 3x */
@@ -1070,6 +1110,7 @@
 #define	USB_PRODUCT_COREGA_RT2870_1	0x002f		/* RT2870 */
 #define	USB_PRODUCT_COREGA_RT2870_2	0x003c		/* RT2870 */
 #define	USB_PRODUCT_COREGA_RT2870_3	0x003f		/* RT2870 */
+#define	USB_PRODUCT_COREGA_RT3070	0x0041		/* RT3070 */
 #define	USB_PRODUCT_COREGA_RTL8192CU	0x0056		/* RTL8192CU */
 #define	USB_PRODUCT_COREGA_CGWLUSB300GNM	0x0042		/* CG-WLUSB300GNM */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
@@ -1239,6 +1280,9 @@
 /* DrayTek products */
 #define	USB_PRODUCT_DRAYTEK_VIGOR550	0x0550		/* Vigor550 */
 
+/* DViCO products */
+#define	USB_PRODUCT_DVICO_RT3070	0xb307		/* RT3070 */
+
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 
@@ -1249,6 +1293,7 @@
 #define	USB_PRODUCT_EDIMAX_RT2870_1	0x7711		/* RT2870 */
 #define	USB_PRODUCT_EDIMAX_EW7717	0x7717		/* EW-7717 */
 #define	USB_PRODUCT_EDIMAX_EW7718	0x7718		/* EW-7718 */
+#define	USB_PRODUCT_EDIMAX_EW7722UTN	0x7722		/* EW-7722UTn */
 #define	USB_PRODUCT_EDIMAX_RTL8188CU	0x7811		/* RTL8188CU */
 #define	USB_PRODUCT_EDIMAX_RTL8192CU	0x7822		/* RTL8192CU */
 
@@ -1291,6 +1336,8 @@
 
 /* Encore products */
 #define	USB_PRODUCT_ENCORE_RT3070	0x1480		/* RT3070 */
+#define	USB_PRODUCT_ENCORE_RT3070_2	0x14a1		/* RT3070 */
+#define	USB_PRODUCT_ENCORE_RT3070_3	0x14a9		/* RT3070 */
 
 /* Entrega products */
 #define	USB_PRODUCT_ENTREGA_1S	0x0001		/* 1S serial connector */
@@ -1408,6 +1455,8 @@
 
 /* Gigaset products */
 #define	USB_PRODUCT_GIGASET_RT2573	0x0722		/* RT2573 */
+#define	USB_PRODUCT_GIGASET_RT3070_1	0x0740		/* RT3070 */
+#define	USB_PRODUCT_GIGASET_RT3070_2	0x0744		/* RT3070 */
 
 /* G.Mate, Inc products */
 #define	USB_PRODUCT_GMATE_YP3X00	0x1001		/* YP3X00 PDA */
@@ -1478,6 +1527,9 @@
 #define	USB_PRODUCT_HAWKING_RT2870_2	0x0003		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_HWUN2	0x0009		/* HWUN2 */
 #define	USB_PRODUCT_HAWKING_RT3070	0x000b		/* RT3070 */
+#define	USB_PRODUCT_HAWKING_RT2870_3	0x0013		/* RT2870 */
+#define	USB_PRODUCT_HAWKING_RT2870_4	0x0017		/* RT2870 */
+#define	USB_PRODUCT_HAWKING_RT2870_5	0x0018		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_UF100	0x400c		/* 10/100 USB Ethernet */
 
 /* Hitachi, Ltd. products */
@@ -1778,6 +1830,8 @@
 #define	USB_PRODUCT_LINKSYS4_WUSB600N	0x0071		/* WUSB600N */
 #define	USB_PRODUCT_LINKSYS4_WUSB54GC_2	0x0073		/* WUSB54GC v2 */
 #define	USB_PRODUCT_LINKSYS4_WUSB54GC_3	0x0077		/* WUSB54GC v3 */
+#define	USB_PRODUCT_LINKSYS4_RT3070	0x0078		/* RT3070 */
+#define	USB_PRODUCT_LINKSYS4_WUSB600NV2	0x0079		/* WUSB600N v2 */
 
 /* Logitec products */
 #define	USB_PRODUCT_LOGITEC_LDR_H443SU2	0x0033		/* DVD Multi-plus unit LDR-H443SU2 */
@@ -1788,6 +1842,8 @@
 #define	USB_PRODUCT_LOGITEC_RT2870_1	0x0162		/* RT2870 */
 #define	USB_PRODUCT_LOGITEC_RT2870_2	0x0163		/* RT2870 */
 #define	USB_PRODUCT_LOGITEC_RT2870_3	0x0164		/* RT2870 */
+#define	USB_PRODUCT_LOGITEC_LANW300NU2	0x0166		/* LAN-W300N/U2 */
+#define	USB_PRODUCT_LOGITEC_RT3020	0x0168		/* RT3020 */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
@@ -1871,7 +1927,12 @@
 #define	USB_PRODUCT_MELCO_WLIUCG300N	0x00e8		/* WLI-UC-G300N */
 #define	USB_PRODUCT_MELCO_WLIUCAG300N	0x012e		/* WLI-UC-AG300N */
 #define	USB_PRODUCT_MELCO_WLIUCG	0x0137		/* WLI-UC-G */
+#define	USB_PRODUCT_MELCO_RT2870_1	0x0148		/* RT2870 */
+#define	USB_PRODUCT_MELCO_RT2870_2	0x0150		/* RT2870 */
+#define	USB_PRODUCT_MELCO_WLIUCGNHP	0x0158		/* WLI-UC-GNHP */
 #define	USB_PRODUCT_MELCO_WLIUCGN	0x015d		/* WLI-UC-GN */
+#define	USB_PRODUCT_MELCO_WLIUCG301N	0x016f		/* WLI-UC-G301N */
+#define	USB_PRODUCT_MELCO_WLIUCGNM	0x01a2		/* WLI-UC-GNM */
 
 /* Merlin products */
 #define	USB_PRODUCT_MERLIN_V620	0x1110		/* Merlin V620 */
@@ -1886,6 +1947,10 @@
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth USB Adapter */
 #define	USB_PRODUCT_MSI_RT3070	0x3820		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_2	0x3821		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_8	0x3822		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_3	0x3870		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_9	0x3871		/* RT3070 */
 #define	USB_PRODUCT_MSI_MEGASKY580	0x5580		/* MSI MegaSky DVB-T Adapter */
 #define	USB_PRODUCT_MSI_MEGASKY580_55801	0x5581		/* MSI MegaSky DVB-T Adapter */
 #define	USB_PRODUCT_MSI_MS6861	0x6861		/* MS-6861 */
@@ -1893,6 +1958,16 @@
 #define	USB_PRODUCT_MSI_MS6869	0x6869		/* MS-6869 */
 #define	USB_PRODUCT_MSI_RT2573	0x6874		/* RT2573 */
 #define	USB_PRODUCT_MSI_RT2573_2	0x6877		/* RT2573 */
+#define	USB_PRODUCT_MSI_RT3070_4	0x6899		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_5	0x821a		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_10	0x822a		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_12	0x822b		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_13	0x822c		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_6	0x870a		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_11	0x871a		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_14	0x871b		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_15	0x871c		/* RT3070 */
+#define	USB_PRODUCT_MSI_RT3070_7	0x899a		/* RT3070 */
 #define	USB_PRODUCT_MSI_RT2573_3	0xa861		/* RT2573 */
 #define	USB_PRODUCT_MSI_RT2573_4	0xa874		/* RT2573 */
 #define	USB_PRODUCT_MSI_AX88772A	0xa877		/* AX88772A USB 2.0 10/100 Ethernet adapter */
@@ -1990,6 +2065,8 @@
 #define	USB_PRODUCT_MOTOROLA2_A920	0x4002		/* A920 */
 #define	USB_PRODUCT_MOTOROLA2_USBLAN	0x600c		/* USBLAN (A780, E680, ...) */
 #define	USB_PRODUCT_MOTOROLA2_USBLAN2	0x6027		/* USBLAN (A910, A1200, Rokr E2, Rokr E6, ...) */
+#define	USB_PRODUCT_MOTOROLA4_RT2770	0x9031		/* RT2770 */
+#define	USB_PRODUCT_MOTOROLA4_RT3070	0x9032		/* RT3070 */
 
 /* M-Systems products */
 #define	USB_PRODUCT_MSYSTEMS_DISKONKEY	0x0010		/* DiskOnKey */
@@ -2172,6 +2249,10 @@
 #define	USB_PRODUCT_OTI_SOLID	0x6803		/* Solid state disk */
 #define	USB_PRODUCT_OTI_FLASHDISK	0x6828		/* Flash Disk 128M */
 
+/* OvisLink product */
+#define	USB_PRODUCT_OVISLINK_RT3071	0x3071		/* RT3071 */
+#define	USB_PRODUCT_OVISLINK_RT3072	0x3072		/* RT3072 */
+
 /* Palm Computing, Inc. product */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
 #define	USB_PRODUCT_PALM_M500	0x0001		/* Palm m500 */
@@ -2193,10 +2274,15 @@
 #define	USB_PRODUCT_PANASONIC_SDCAAE	0x1b00		/* MultiMediaCard Adapter */
 #define	USB_PRODUCT_PANASONIC_TYTP50P6S	0x3900		/* TY-TP50P6-S 50in Touch Panel */
 
+/* PARA Industrial products */
+#define	USB_PRODUCT_PARA_RT3070	0x8888		/* RT3070 */
+
 /* Pegatron products */
 #define	USB_PRODUCT_PEGATRON_RT2870	0x0002		/* RT2870 */
 #define	USB_PRODUCT_PEGATRON_RT3070	0x000c		/* RT3070 */
 #define	USB_PRODUCT_PEGATRON_RT3070_2	0x000e		/* RT3070 */
+#define	USB_PRODUCT_PEGATRON_RT3070_3	0x0010		/* RT3070 */
+#define	USB_PRODUCT_PEGATRON_RT3072	0x0011		/* RT3072 */
 
 /* Pen Driver */
 #define	USB_PRODUCT_PEN_USBDISKPRO	0x0120		/* USB Disk Pro */
@@ -2272,6 +2358,7 @@
 #define	USB_PRODUCT_PLANEX3_GWUS54MINI	0xab13		/* GW-US54Mini */
 #define	USB_PRODUCT_PLANEX2_GWUS300MINIS	0xab24		/* GW-US300MiniS */
 #define	USB_PRODUCT_PLANEX2_RT3070	0xab25		/* RT3070 */
+#define	USB_PRODUCT_PLANEX2_GWUSMICRO300	0xab29		/* GW-USMicro300 */
 #define	USB_PRODUCT_PLANEX2_GWUS300MINIX	0xed06		/* GW-US300Mini-X/MiniW */
 #define	USB_PRODUCT_PLANEX2_RTL8188CU_2	0xed17		/* RTL8188CU */
 
@@ -2376,6 +2463,9 @@
 #define	USB_PRODUCT_RALINK_RT3070	0x3070		/* RT3070 */
 #define	USB_PRODUCT_RALINK_RT3071	0x3071		/* RT3071 */
 #define	USB_PRODUCT_RALINK_RT3072	0x3072		/* RT3072 */
+#define	USB_PRODUCT_RALINK_RT3370	0x3370		/* RT3370 */
+#define	USB_PRODUCT_RALINK_RT3572	0x3572		/* RT3572 */
+#define	USB_PRODUCT_RALINK_RT8070	0x8070		/* RT8070 */
 #define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_2_RT2570	0x2570		/* RT2570 */
 #define	USB_PRODUCT_RALINK_2_RT2573	0x2573		/* RT2573 */
@@ -2498,6 +2588,10 @@
 #define	USB_PRODUCT_SENAO_RT3070	0x9703		/* RT3070 */
 #define	USB_PRODUCT_SENAO_RT3071	0x9705		/* RT3071 */
 #define	USB_PRODUCT_SENAO_RT3072	0x9706		/* RT3072 */
+#define	USB_PRODUCT_SENAO_RT3072_2	0x9707		/* RT3072 */
+#define	USB_PRODUCT_SENAO_RT3072_3	0x9708		/* RT3072 */
+#define	USB_PRODUCT_SENAO_RT3072_4	0x9709		/* RT3072 */
+#define	USB_PRODUCT_SENAO_RT3072_5	0x9801		/* RT3072 */
 
 /* SGI products */
 #define	USB_PRODUCT_SGI_SN1_L1_SC	0x1234		/* SN1 L1 System Controller */
@@ -2630,15 +2724,24 @@
 #define	USB_PRODUCT_SITECOMEU_WL168V4	0x0028		/* WL-168 v4 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_2	0x002b		/* RT2870 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_3	0x002c		/* RT2870 */
-#define	USB_PRODUCT_SITECOMEU_RT2870_4	0x002d		/* RT2870 */
-#define	USB_PRODUCT_SITECOMEU_RT2770	0x0039		/* RT2770 */
-#define	USB_PRODUCT_SITECOMEU_RT3070_2	0x003b		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_WL302	0x002d		/* WL-302 */
+#define	USB_PRODUCT_SITECOMEU_WL315	0x0039		/* WL-315 */
+#define	USB_PRODUCT_SITECOMEU_WL321	0x003b		/* WL-321 */
 #define	USB_PRODUCT_SITECOMEU_RT3070_3	0x003c		/* RT3070 */
-#define	USB_PRODUCT_SITECOMEU_RT3070_4	0x003d		/* RT3070 */
-#define	USB_PRODUCT_SITECOMEU_RT3070	0x003e		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_WL324	0x003d		/* WL-324 */
+#define	USB_PRODUCT_SITECOMEU_WL343	0x003e		/* WL-343 */
 #define	USB_PRODUCT_SITECOMEU_WL608	0x003f		/* WL-608 */
-#define	USB_PRODUCT_SITECOMEU_RT3072	0x0042		/* RT3072 */
+#define	USB_PRODUCT_SITECOMEU_WL344	0x0040		/* WL-344 */
+#define	USB_PRODUCT_SITECOMEU_WL329	0x0041		/* WL-329 */
+#define	USB_PRODUCT_SITECOMEU_WL345	0x0042		/* WL-345 */
+#define	USB_PRODUCT_SITECOMEU_RT3072_3	0x0047		/* RT3072 */
+#define	USB_PRODUCT_SITECOMEU_RT3072_4	0x0048		/* RT3072 */
+#define	USB_PRODUCT_SITECOMEU_WL349V4	0x0050		/* WL-349 v4 */
+#define	USB_PRODUCT_SITECOMEU_RT3070_1	0x0051		/* RT3070 */
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU	0x0052		/* RTL8188CU */
+#define	USB_PRODUCT_SITECOMEU_RT3072_5	0x005f		/* RT3072 */
+#define	USB_PRODUCT_SITECOMEU_WLA4000	0x0060		/* WLA-4000 */
+#define	USB_PRODUCT_SITECOMEU_WLA5000	0x0062		/* WLA-5000 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
 #define	USB_PRODUCT_SITECOMEU_ZD1211B	0x9075		/* ZD1211B */
@@ -2718,6 +2821,7 @@
 #define	USB_PRODUCT_SPARKLAN_RT2573	0x0004		/* RT2573 */
 #define	USB_PRODUCT_SPARKLAN_RT2870_1	0x0006		/* RT2870 */
 #define	USB_PRODUCT_SPARKLAN_RT3070	0x0010		/* RT3070 */
+#define	USB_PRODUCT_SPARKLAN_RT2870_2	0x0012		/* RT2870 */
 
 /*Springer Design Systems Inc.*/
 #define	USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER	0x1111		/* Springer Design TTSMP3Player */
@@ -2772,6 +2876,8 @@
 
 /* Sweex products */
 #define	USB_PRODUCT_SWEEX_ZD1211	0x1809		/* ZD1211 */
+#define	USB_PRODUCT_SWEEX2_LW153	0x0153		/* LW153 */
+#define	USB_PRODUCT_SWEEX2_LW154	0x0154		/* LW154 */
 #define	USB_PRODUCT_SWEEX2_LW303	0x0302		/* LW303 */
 #define	USB_PRODUCT_SWEEX2_LW313	0x0313		/* LW313 */
 
@@ -2830,6 +2936,7 @@
 
 /* Toshiba Corporation products */
 #define	USB_PRODUCT_TOSHIBA_POCKETPC_E740	0x0706		/* PocketPC e740 */
+#define	USB_PRODUCT_TOSHIBA_RT3070	0x0a07		/* RT3070 */
 #define	USB_PRODUCT_TOSHIBA_HSDPA_MODEM_EU870DT1	0x1302		/* HSDPA 3G Modem Card */
 
 /* Trek Technology products */
@@ -2870,6 +2977,7 @@
 #define	USB_PRODUCT_UMEDIA_TEW429UB	0x300b		/* TEW-429UB */
 #define	USB_PRODUCT_UMEDIA_TEW429UBC1	0x300d		/* TEW-429UB C1 */
 #define	USB_PRODUCT_UMEDIA_RT2870_1	0x300e		/* RT2870 */
+#define	USB_PRODUCT_UMEDIA_TEW645UB	0x3013		/* TEW-645UB */
 #define	USB_PRODUCT_UMEDIA_ALL0298V2	0x3204		/* ALL0298 v2 */
 
 /* Universal Access products */
@@ -2994,6 +3102,7 @@
 #define	USB_PRODUCT_ZINWELL_RT2870_1	0x0280		/* RT2870 */
 #define	USB_PRODUCT_ZINWELL_RT2870_2	0x0282		/* RT2870 */
 #define	USB_PRODUCT_ZINWELL_RT3072	0x0283		/* RT3072 */
+#define	USB_PRODUCT_ZINWELL_RT3072_2	0x0284		/* RT3072 */
 #define	USB_PRODUCT_ZINWELL_RT3070	0x5257		/* RT3070 */
 
 /* Zoom Telephonics, Inc. products */
@@ -3021,6 +3130,9 @@
 #define	USB_PRODUCT_ZYXEL_RT2573	0x3415		/* RT2573 */
 #define	USB_PRODUCT_ZYXEL_RT2870_1	0x3416		/* RT2870 */
 #define	USB_PRODUCT_ZYXEL_NWD271N	0x3417		/* NWD-271N */
+#define	USB_PRODUCT_ZYXEL_NWD211AN	0x3418		/* NWD-211AN */
 #define	USB_PRODUCT_ZYXEL_RT2870_2	0x341a		/* RT2870 */
+#define	USB_PRODUCT_ZYXEL_NWD2105	0x341e		/* NWD2105 */
 #define	USB_PRODUCT_ZYXEL_RTL8192CU	0x341f		/* RTL8192CU */
+#define	USB_PRODUCT_ZYXEL_RT3070	0x343e		/* RT3070 */
 #define	USB_PRODUCT_ZYXEL_PRESTIGE	0x401a		/* Prestige */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.610 src/sys/dev/usb/usbdevs_data.h:1.611
--- src/sys/dev/usb/usbdevs_data.h:1.610	Tue May 29 14:05:01 2012
+++ src/sys/dev/usb/usbdevs_data.h	Tue May 29 19:49:10 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.610 2012/05/29 14:05:01 christos Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.611 2012/05/29 19:49:10 nonaka Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp
+ *	NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp
  */
 
 /*
@@ -587,6 +587,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "LaCie",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS3,
+	    "Cisco-Linksys",
+	},
+	{
 	    USB_VENDOR_OMNIVISION,
 	    "OmniVision",
 	},
@@ -1035,6 +1039,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "STSN",
 	},
 	{
+	    USB_VENDOR_BEWAN,
+	    "Bewan",
+	},
+	{
 	    USB_VENDOR_ZOOM,
 	    "Zoom Telephonics",
 	},
@@ -1551,10 +1559,18 @@ const struct usb_vendor usb_vendors[] = 
 	    "SUNRISING",
 	},
 	{
+	    USB_VENDOR_DVICO,
+	    "DViCO",
+	},
+	{
 	    USB_VENDOR_QUALCOMM,
 	    "Qualcomm",
 	},
 	{
+	    USB_VENDOR_MOTOROLA4,
+	    "Motorola",
+	},
+	{
 	    USB_VENDOR_HP3,
 	    "Hewlett Packard",
 	},
@@ -1799,6 +1815,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "Actiontec Electronics",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS2,
+	    "Cisco-Linksys",
+	},
+	{
 	    USB_VENDOR_ATHEROS,
 	    "Atheros Communications",
 	},
@@ -1875,6 +1895,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "QinHeng Electronics",
 	},
 	{
+	    USB_VENDOR_OVISLINK,
+	    "OvisLink",
+	},
+	{
 	    USB_VENDOR_MPMAN,
 	    "MPMan",
 	},
@@ -1907,6 +1931,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "Hauppauge Computer Works",
 	},
 	{
+	    USB_VENDOR_PARA,
+	    "PARA Industrial",
+	},
+	{
 	    USB_VENDOR_TRENDNET,
 	    "TRENDnet",
 	},
@@ -2031,6 +2059,10 @@ const struct usb_vendor usb_vendors[] = 
 	    "Intel",
 	},
 	{
+	    USB_VENDOR_ALLWIN,
+	    "ALLWIN Tech",
+	},
+	{
 	    USB_VENDOR_MOSCHIP,
 	    "MosChip Semiconductor",
 	},
@@ -2055,7 +2087,7 @@ const struct usb_vendor usb_vendors[] = 
 	    "GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 504;
+const int usb_nvendors = 512;
 
 const struct usb_product usb_products[] = {
 	{
@@ -2307,6 +2339,10 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_6,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_1,
 	    "RT2870",
 	},
@@ -2503,6 +2539,10 @@ const struct usb_product usb_products[] 
 	    "CDMA Wireless PC Card",
 	},
 	{
+	    USB_VENDOR_AIRTIES, USB_PRODUCT_AIRTIES_RT3070_2,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_AIRTIES, USB_PRODUCT_AIRTIES_RT3070,
 	    "RT3070",
 	},
@@ -2539,6 +2579,34 @@ const struct usb_product usb_products[] 
 	    "NEC Kbd Hub",
 	},
 	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2070,
+	    "RT2070",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2870,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3071,
+	    "RT3071",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3072,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3572,
+	    "RT3572",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    "ADA70 Speakers",
 	},
@@ -2823,6 +2891,14 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT3070_1,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_MYPAL_A730,
 	    "MyPal A730",
 	},
@@ -2971,6 +3047,22 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070_2,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070_3,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070_4,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070_5,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RTL8188CE_1,
 	    "RTL8188CE",
 	},
@@ -3079,6 +3171,10 @@ const struct usb_product usb_products[] 
 	    "F5D8055",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D8055V2,
+	    "F5D8055 v2",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3,
 	    "F5D9050 ver 3",
 	},
@@ -3087,6 +3183,22 @@ const struct usb_product usb_products[] 
 	    "F6D4050 ver 1",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6D4050V2,
+	    "F6D4050 ver 2",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F7D1101V2,
+	    "F7D1101 v2",
+	},
+	{
+	    USB_VENDOR_BEWAN, USB_PRODUCT_BEWAN_BWIFI_USB54AR,
+	    "BWIFI-USB54AR",
+	},
+	{
+	    USB_VENDOR_BEWAN, USB_PRODUCT_BEWAN_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    "USB100N 10/100 FastEthernet Adapter",
 	},
@@ -3295,6 +3407,22 @@ const struct usb_product usb_products[] 
 	    "WUSBF54G",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_AE1000,
+	    "AE1000",
+	},
+	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_AM10,
+	    "AM10",
+	},
+	{
+	    USB_VENDOR_CISCOLINKSYS2, USB_PRODUCT_CISCOLINKSYS2_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_CISCOLINKSYS3, USB_PRODUCT_CISCOLINKSYS3_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC,
 	    "iPAQ PocketPC",
 	},
@@ -3343,10 +3471,18 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT3070_1,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_7,
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT3070_2,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_8,
 	    "RT2870",
 	},
@@ -3359,6 +3495,10 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2573,
+	    "RT2573M",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_4,
 	    "RT2870",
 	},
@@ -3371,6 +3511,10 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT3070_3,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
 	    "Eye Q 3x",
 	},
@@ -3435,6 +3579,10 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RTL8192CU,
 	    "RTL8192CU",
 	},
@@ -3931,6 +4079,10 @@ const struct usb_product usb_products[] 
 	    "Vigor550",
 	},
 	{
+	    USB_VENDOR_DVICO, USB_PRODUCT_DVICO_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD,
 	    "ANT dev board",
 	},
@@ -3951,6 +4103,10 @@ const struct usb_product usb_products[] 
 	    "EW-7718",
 	},
 	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7722UTN,
+	    "EW-7722UTn",
+	},
+	{
 	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RTL8188CU,
 	    "RTL8188CU",
 	},
@@ -4047,6 +4203,14 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_ENCORE, USB_PRODUCT_ENCORE_RT3070_2,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_ENCORE, USB_PRODUCT_ENCORE_RT3070_3,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
 	    "1S serial connector",
 	},
@@ -4379,6 +4543,14 @@ const struct usb_product usb_products[] 
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT3070_1,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT3070_2,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00,
 	    "YP3X00 PDA",
 	},
@@ -4523,6 +4695,18 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_5,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
 	    "10/100 USB Ethernet",
 	},
@@ -5403,6 +5587,14 @@ const struct usb_product usb_products[] 
 	    "WUSB54GC v3",
 	},
 	{
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB600NV2,
+	    "WUSB600N v2",
+	},
+	{
 	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2,
 	    "DVD Multi-plus unit LDR-H443SU2",
 	},
@@ -5435,6 +5627,14 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LANW300NU2,
+	    "LAN-W300N/U2",
+	},
+	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT3020,
+	    "RT3020",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    "M2452 keyboard",
 	},
@@ -5695,10 +5895,30 @@ const struct usb_product usb_products[] 
 	    "WLI-UC-G",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNHP,
+	    "WLI-UC-GNHP",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGN,
 	    "WLI-UC-GN",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCG301N,
+	    "WLI-UC-G301N",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNM,
+	    "WLI-UC-GNM",
+	},
+	{
 	    USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620,
 	    "Merlin V620",
 	},
@@ -5723,6 +5943,22 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_2,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_8,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_3,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_9,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_MEGASKY580,
 	    "MSI MegaSky DVB-T Adapter",
 	},
@@ -5751,6 +5987,46 @@ const struct usb_product usb_products[] 
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_4,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_5,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_10,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_12,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_13,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_6,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_11,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_14,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_15,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_7,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_3,
 	    "RT2573",
 	},
@@ -6027,6 +6303,14 @@ const struct usb_product usb_products[] 
 	    "USBLAN (A910, A1200, Rokr E2, Rokr E6, ...)",
 	},
 	{
+	    USB_VENDOR_MOTOROLA4, USB_PRODUCT_MOTOROLA4_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_MOTOROLA4, USB_PRODUCT_MOTOROLA4_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
 	    "DiskOnKey",
 	},
@@ -6539,6 +6823,14 @@ const struct usb_product usb_products[] 
 	    "Flash Disk 128M",
 	},
 	{
+	    USB_VENDOR_OVISLINK, USB_PRODUCT_OVISLINK_RT3071,
+	    "RT3071",
+	},
+	{
+	    USB_VENDOR_OVISLINK, USB_PRODUCT_OVISLINK_RT3072,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    "USB Serial Adaptor",
 	},
@@ -6607,6 +6899,10 @@ const struct usb_product usb_products[] 
 	    "TY-TP50P6-S 50in Touch Panel",
 	},
 	{
+	    USB_VENDOR_PARA, USB_PRODUCT_PARA_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT2870,
 	    "RT2870",
 	},
@@ -6619,6 +6915,14 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070_3,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3072,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISKPRO,
 	    "USB Disk Pro",
 	},
@@ -6847,6 +7151,10 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMICRO300,
+	    "GW-USMicro300",
+	},
+	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS300MINIX,
 	    "GW-US300Mini-X/MiniW",
 	},
@@ -7111,6 +7419,18 @@ const struct usb_product usb_products[] 
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3370,
+	    "RT3370",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3572,
+	    "RT3572",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT8070,
+	    "RT8070",
+	},
+	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
 	    "RT2570",
 	},
@@ -7487,6 +7807,22 @@ const struct usb_product usb_products[] 
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3072_2,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3072_3,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3072_4,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3072_5,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
 	    "SN1 L1 System Controller",
 	},
@@ -7875,42 +8211,78 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_4,
-	    "RT2870",
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL302,
+	    "WL-302",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2770,
-	    "RT2770",
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL315,
+	    "WL-315",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_2,
-	    "RT3070",
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL321,
+	    "WL-321",
 	},
 	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_3,
 	    "RT3070",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_4,
-	    "RT3070",
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL324,
+	    "WL-324",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070,
-	    "RT3070",
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL343,
+	    "WL-343",
 	},
 	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL608,
 	    "WL-608",
 	},
 	{
-	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072,
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL344,
+	    "WL-344",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL329,
+	    "WL-329",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL345,
+	    "WL-345",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_3,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_4,
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL349V4,
+	    "WL-349 v4",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_1,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RTL8188CU,
 	    "RTL8188CU",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_5,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WLA4000,
+	    "WLA-4000",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WLA5000,
+	    "WLA-5000",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028,
 	    "LN-028",
 	},
@@ -8163,6 +8535,10 @@ const struct usb_product usb_products[] 
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SPRINGERDESIGN, USB_PRODUCT_SPRINGERDESIGN_TTSMP3PLAYER,
 	    "Springer Design TTSMP3Player",
 	},
@@ -8271,6 +8647,14 @@ const struct usb_product usb_products[] 
 	    "ZD1211",
 	},
 	{
+	    USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW153,
+	    "LW153",
+	},
+	{
+	    USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW154,
+	    "LW154",
+	},
+	{
 	    USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW303,
 	    "LW303",
 	},
@@ -8383,6 +8767,10 @@ const struct usb_product usb_products[] 
 	    "PocketPC e740",
 	},
 	{
+	    USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_HSDPA_MODEM_EU870DT1,
 	    "HSDPA 3G Modem Card",
 	},
@@ -8471,6 +8859,10 @@ const struct usb_product usb_products[] 
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW645UB,
+	    "TEW-645UB",
+	},
+	{
 	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2,
 	    "ALL0298 v2",
 	},
@@ -8799,6 +9191,10 @@ const struct usb_product usb_products[] 
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3072_2,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3070,
 	    "RT3070",
 	},
@@ -8883,16 +9279,28 @@ const struct usb_product usb_products[] 
 	    "NWD-271N",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_NWD211AN,
+	    "NWD-211AN",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870_2,
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_NWD2105,
+	    "NWD2105",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RTL8192CU,
 	    "RTL8192CU",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_PRESTIGE,
 	    "Prestige",
 	},
 };
-const int usb_nproducts = 1709;
+const int usb_nproducts = 1803;

Reply via email to