Module Name:    src
Committed By:   sborrill
Date:           Thu Nov 25 14:16:55 UTC 2010

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.560 -r1.561 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.561 -r1.562 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.560 src/sys/dev/usb/usbdevs.h:1.561
--- src/sys/dev/usb/usbdevs.h:1.560	Thu Nov  4 09:19:14 2010
+++ src/sys/dev/usb/usbdevs.h	Thu Nov 25 14:16:55 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.560 2010/11/04 09:19:14 pooka Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.561 2010/11/25 14:16:55 sborrill Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp
+ *	NetBSD: usbdevs,v 1.568 2010/11/25 14:16:24 sborrill Exp
  */
 
 /*
@@ -423,6 +423,7 @@
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star */
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_SITECOMEU	0x0df6		/* Sitecom Europe */
+#define	USB_VENDOR_AMIGO	0x0e0b		/* Amigo Technology */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
 #define	USB_VENDOR_GMATE	0x0e7e		/* G.Mate, Inc */
 #define	USB_VENDOR_MTK	0x0e8d		/* MTK */
@@ -472,12 +473,14 @@
 #define	USB_VENDOR_BALTECH	0x13ad		/* Baltech */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
+#define	USB_VENDOR_AZUREWAVE	0x13d3		/* AzureWave */
 #define	USB_VENDOR_PHISON	0x13fe		/* Phison Electronics Corp. */
 #define	USB_VENDOR_NOVATEL2	0x1410		/* Novatel */
 #define	USB_VENDOR_OMNIVISION2	0x1415		/* OmniVision Technologies, Inc. */
 #define	USB_VENDOR_MERLIN	0x1416		/* Merlin */
 #define	USB_VENDOR_WISTRONNEWEB	0x1435		/* Wistron NeWeb */
 #define	USB_VENDOR_HUAWEI3COM	0x1472		/* Huawei-3Com */
+#define	USB_VENDOR_ABOCOM2	0x1482		/* AboCom Systems */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x1485		/* Ralink Technology */
 #define	USB_VENDOR_RALINK_2	0x148f		/* Ralink Technology */
@@ -488,6 +491,8 @@
 #define	USB_VENDOR_OQO	0x1557		/* OQO */
 #define	USB_VENDOR_UMEDIA	0x157e		/* U-MEDIA Communications */
 #define	USB_VENDOR_FIBERLINE	0x1582		/* Fiberline */
+#define	USB_VENDOR_AMIT2	0x15c5		/* AMIT */
+#define	USB_VENDOR_SPARKLAN	0x15a9		/* SparkLAN */
 #define	USB_VENDOR_SOHOWARE	0x15e8		/* SOHOware */
 #define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -500,6 +505,8 @@
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_LINKSYS4	0x1737		/* Linksys */
 #define	USB_VENDOR_SENAO	0x1740		/* Senao */
+#define	USB_VENDOR_ASUSTEK2	0x1761		/* ASUSTeK Computer */
+#define	USB_VENDOR_SWEEX2	0x177f		/* Sweex */
 #define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
 #define	USB_VENDOR_DISPLAYLINK	0x17e9		/* DisplayLink */
 #define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
@@ -507,9 +514,13 @@
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_MEINBERG	0x1938		/* Meinberg Funkuhren */
 #define	USB_VENDOR_QUALCOMMINC	0x19d2		/* Qualcomm, Incorporated */
+#define	USB_VENDOR_QUANTA	0x1a32		/* Quanta */
 #define	USB_VENDOR_WINCHIPHEAD2	0x1a86		/* QinHeng Electronics */
+#define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
+#define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
+#define	USB_VENDOR_ENCORE	0x203d		/* Encore */
 #define	USB_VENDOR_DLINK3	0x2101		/* D-Link */
 #define	USB_VENDOR_ERICSSON	0x2282		/* Ericsson */
 #define	USB_VENDOR_MOTOROLA2	0x22b8		/* Motorola */
@@ -536,6 +547,7 @@
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
 #define	USB_VENDOR_ARKMICROCHIPS	0x6547		/* ArkMicroChips */
 #define	USB_VENDOR_3COM2	0x6891		/* 3Com */
+#define	USB_VENDOR_EDIMAX	0x7392		/* EDIMAX */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip Semiconductor */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
@@ -569,6 +581,12 @@
 /* AboCom products */
 #define	USB_PRODUCT_ABOCOM_XX1	0x110c		/* XX1 */
 #define	USB_PRODUCT_ABOCOM_XX2	0x200c		/* XX2 */
+#define	USB_PRODUCT_ABOCOM_RT2770	0x2770		/* RT2770 */
+#define	USB_PRODUCT_ABOCOM_RT2870	0x2870		/* RT2870 */
+#define	USB_PRODUCT_ABOCOM_RT3070	0x3070		/* RT3070 */
+#define	USB_PRODUCT_ABOCOM_RT3071	0x3071		/* RT3071 */
+#define	USB_PRODUCT_ABOCOM_RT3072	0x3072		/* RT3072 */
+#define	USB_PRODUCT_ABOCOM2_RT2870_1	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_ABOCOM_URE450	0x4000		/* URE450 Ethernet Adapter */
 #define	USB_PRODUCT_ABOCOM_UFE1000	0x4002		/* UFE1000 Fast Ethernet Adapter */
 #define	USB_PRODUCT_ABOCOM_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
@@ -689,6 +707,9 @@
 /* AirPrime products */
 #define	USB_PRODUCT_AIRPRIME_PC5220	0x0112		/* CDMA Wireless PC Card */
 
+/* Airties products */
+#define	USB_PRODUCT_AIRTIES_RT3070	0x2310		/* RT3070 */
+
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
@@ -717,8 +738,15 @@
 /* AMD product */
 #define	USB_PRODUCT_AMD_TV_WONDER_600_USB	0xb002		/* TV Wonder 600 USB */
 
+/* Amigo products */
+#define	USB_PRODUCT_AMIGO_RT2870_1	0x9031		/* RT2870 */
+#define	USB_PRODUCT_AMIGO_RT2870_2	0x9041		/* RT2870 */
+
 /* AMIT products */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
+#define	USB_PRODUCT_AMIT_CGWLUSB2GNR	0x0008		/* CG-WLUSB2GNR */
+#define	USB_PRODUCT_AMIT_RT2870_1	0x0012		/* RT2870 */
+#define	USB_PRODUCT_AMIT2_RT2870	0x0008		/* RT2870 */
 
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
@@ -767,7 +795,13 @@
 #define	USB_PRODUCT_ASUSTEK_A9T_WIFI	0x171b		/* A9T wireless */
 #define	USB_PRODUCT_ASUSTEK_WL167G_2	0x1723		/* WL-167g USB2.0 WLAN Adapter (version 2) */
 #define	USB_PRODUCT_ASUSTEK_WL167G_3	0x1724		/* WL-167g USB2.0 WLAN Adapter (version 2) */
+#define	USB_PRODUCT_ASUSTEK_RT2870_1	0x1731		/* RT2870 */
+#define	USB_PRODUCT_ASUSTEK_RT2870_2	0x1732		/* RT2870 */
+#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_MYPAL_A730	0x4202		/* MyPal A730 */
+#define	USB_PRODUCT_ASUSTEK2_USBN11	0x0b05		/* USB-N11 */
 
 /* ATen products */
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
@@ -821,6 +855,11 @@
 /* AVM products */
 #define	USB_PRODUCT_AVM_FRITZWLAN	0x8401		/* FRITZ!WLAN N */
 
+/* Azurewave products */
+#define	USB_PRODUCT_AZUREWAVE_RT2870_1	0x3247		/* RT2870 */
+#define	USB_PRODUCT_AZUREWAVE_RT2870_2	0x3262		/* RT2870 */
+#define	USB_PRODUCT_AZUREWAVE_RT3070	0x3273		/* RT3070 */
+
 /* Baltech products */
 #define	USB_PRODUCT_BALTECH_CARDREADER	0x9999		/* Card reader */
 
@@ -846,7 +885,12 @@
 #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_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_RT2870_1	0x8053		/* RT2870 */
+#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_F5D9050V3	0x905b		/* F5D9050 ver 3 */
+#define	USB_PRODUCT_BELKIN_F6D4050V1	0x935a		/* F6D4050 ver 1 */
 
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
@@ -943,7 +987,15 @@
 /* Conceptronic products */
 #define	USB_PRODUCT_CONCEPTRONIC2_PRISM_GT	0x3762		/* PrismGT USB 2.0 WLAN */
 #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_RT2870_7	0x3c09		/* RT2870 */
+#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_RT2870_4	0x3c25		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT2870_5	0x3c27		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC_RT2870_6	0x3c28		/* RT2870 */
 
 /* Concord Camera products */
 #define	USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X	0x0100		/* Eye Q 3x */
@@ -963,6 +1015,10 @@
 #define	USB_PRODUCT_COREGA_CGUSBRS232R	0x002a		/* CG-USBRS232R */
 #define	USB_PRODUCT_COREGA_CGWLUSB2GL	0x002d		/* CG-WLUSB2GL */
 #define	USB_PRODUCT_COREGA_CGWLUSB2GPX	0x002e		/* CG-WLUSB2GPX */
+#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_CGWLUSB300GNM	0x0042		/* CG-WLUSB300GNM */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
 
 /* Creative products */
@@ -986,6 +1042,7 @@
 
 /* CyberTAN Technology products */
 #define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
+#define	USB_PRODUCT_CYBERTAN_RT2870	0x1828		/* RT2870 */
 
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
@@ -1118,6 +1175,11 @@
 /* Dynastream Innovations */
 #define	USB_PRODUCT_DYNASTREAM_ANTDEVBOARD	0x1003		/* ANT dev board */
 
+/* Edimax products */
+#define	USB_PRODUCT_EDIMAX_RT2870_1	0x7711		/* RT2870 */
+#define	USB_PRODUCT_EDIMAX_EW7717	0x7717		/* EW-7717 */
+#define	USB_PRODUCT_EDIMAX_EW7718	0x7718		/* EW-7718 */
+
 /* eGalax Products */
 #define	USB_PRODUCT_EGALAX_TPANEL	0x0001		/* Touch Panel */
 #define	USB_PRODUCT_EGALAX_TPANEL2	0x0002		/* Touch Panel */
@@ -1155,6 +1217,9 @@
 /* EMS products */
 #define	USB_PRODUCT_EMS_DUAL_SHOOTER	0x0003		/* PSX gun controller converter */
 
+/* Encore products */
+#define	USB_PRODUCT_ENCORE_RT3070	0x1480		/* RT3070 */
+
 /* Entrega products */
 #define	USB_PRODUCT_ENTREGA_1S	0x0001		/* 1S serial connector */
 #define	USB_PRODUCT_ENTREGA_2S	0x0002		/* 2S serial connector */
@@ -1260,6 +1325,9 @@
 #define	USB_PRODUCT_GIGABYTE_GNWBKG	0x8007		/* GN-WBKG */
 #define	USB_PRODUCT_GIGABYTE_GNWB01GS	0x8008		/* GN-WB01GS */
 #define	USB_PRODUCT_GIGABYTE_GNWI05GS	0x800a		/* GN-WI05GS */
+#define	USB_PRODUCT_GIGABYTE_RT2870_1	0x800b		/* RT2870 */
+#define	USB_PRODUCT_GIGABYTE_GNWB31N	0x800c		/* GN-WB31N */
+#define	USB_PRODUCT_GIGABYTE_GNWB32L	0x800d		/* GN-WB32L */
 
 /* Gigaset products */
 #define	USB_PRODUCT_GIGASET_RT2573	0x0722		/* RT2573 */
@@ -1302,6 +1370,7 @@
 #define	USB_PRODUCT_GUILLEMOT_HWGUSB254	0xe000		/* HWGUSB2-54 WLAN */
 #define	USB_PRODUCT_GUILLEMOT_HWGUSB254LB	0xe010		/* HWGUSB2-54-LB */
 #define	USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP	0xe020		/* HWGUSB2-54V2-AP */
+#define	USB_PRODUCT_GUILLEMOT_HWNU300	0xe030		/* HWNU-300 */
 
 /* Hagiwara products */
 #define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia Card Reader */
@@ -1323,6 +1392,10 @@
 #define	USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM	0x4d12		/* WinTV USB FM */
 
 /* Hawking Technologies products */
+#define	USB_PRODUCT_HAWKING_RT2870_1	0x0001		/* RT2870 */
+#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_UF100	0x400c		/* 10/100 USB Ethernet */
 
 /* Hitachi, Ltd. products */
@@ -1608,6 +1681,9 @@
 #define	USB_PRODUCT_LINKSYS2_USB200M	0x2226		/* USB 2.0 10/100 ethernet controller */
 #define	USB_PRODUCT_LINKSYS3_WUSB11V28	0x2233		/* WUSB11-V28 */
 #define	USB_PRODUCT_LINKSYS4_USB1000	0x0039		/* USB1000 */
+#define	USB_PRODUCT_LINKSYS4_WUSB100	0x0070		/* WUSB100 */
+#define	USB_PRODUCT_LINKSYS4_WUSB600N	0x0071		/* WUSB600N */
+#define	USB_PRODUCT_LINKSYS4_WUSB54GC_3	0x0077		/* WUSB54GC v3 */
 
 /* Logitec products */
 #define	USB_PRODUCT_LOGITEC_LDR_H443SU2	0x0033		/* DVD Multi-plus unit LDR-H443SU2 */
@@ -1615,6 +1691,9 @@
 #define	USB_PRODUCT_LOGITEC_LAN_GTJU2	0x0102		/* LAN-GTJ/U2 */
 #define	USB_PRODUCT_LOGITEC_LANTX	0x0105		/* LAN-TX */
 #define	USB_PRODUCT_LOGITEC_RTL8187	0x010c		/* RTL8187 */
+#define	USB_PRODUCT_LOGITEC_RT2870_1	0x0162		/* RT2870 */
+#define	USB_PRODUCT_LOGITEC_RT2870_2	0x0163		/* RT2870 */
+#define	USB_PRODUCT_LOGITEC_RT2870_3	0x0164		/* RT2870 */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
@@ -1695,7 +1774,10 @@
 #define	USB_PRODUCT_MELCO_SG54HP	0x00d8		/* WLI-U2-SG54HP */
 #define	USB_PRODUCT_MELCO_G54HP	0x00d9		/* WLI-U2-G54HP */
 #define	USB_PRODUCT_MELCO_KG54L	0x00da		/* WLI-U2-KG54L */
+#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_WLIUCGN	0x015d		/* WLI-UC-GN */
 
 /* Merlin products */
 #define	USB_PRODUCT_MERLIN_V620	0x1110		/* Merlin V620 */
@@ -1712,6 +1794,7 @@
 
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth USB Adapter */
+#define	USB_PRODUCT_MSI_RT3070	0x3820		/* RT3070 */
 #define	USB_PRODUCT_MSI_MS6861	0x6861		/* MS-6861 */
 #define	USB_PRODUCT_MSI_MS6865	0x6865		/* MS-6865 */
 #define	USB_PRODUCT_MSI_MS6869	0x6869		/* MS-6869 */
@@ -2002,6 +2085,11 @@
 #define	USB_PRODUCT_PANASONIC_SDCAAE	0x1b00		/* MultiMediaCard Adapter */
 #define	USB_PRODUCT_PANASONIC_TYTP50P6S	0x3900		/* TY-TP50P6-S 50in Touch Panel */
 
+/* Pegatron products */
+#define	USB_PRODUCT_PEGATRON_RT2870	0x0002		/* RT2870 */
+#define	USB_PRODUCT_PEGATRON_RT3070	0x000c		/* RT3070 */
+#define	USB_PRODUCT_PEGATRON_RT3070_2	0x000e		/* RT3070 */
+
 /* Pen Driver */
 #define	USB_PRODUCT_PEN_USBDISKPRO	0x0120		/* USB Disk Pro */
 #define	USB_PRODUCT_PEN_USBREADER	0x0240		/* USB 6 in 1 Card Reader/Writer */
@@ -2035,6 +2123,7 @@
 #define	USB_PRODUCT_PHILIPS_CPWUA054	0x1230		/* CPWUA054 */
 #define	USB_PRODUCT_PHILIPS_SNU5600	0x1236		/* SNU5600 */
 #define	USB_PRODUCT_PHILIPS_DIVAUSB	0x1801		/* DIVA USB mp3 player */
+#define	USB_PRODUCT_PHILIPS_RT2870	0x200f		/* RT2870 */
 
 /* Philips Semiconductor products */
 #define	USB_PRODUCT_PHILIPSSEMI_HUB1122	0x1122		/* hub */
@@ -2070,8 +2159,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_GWUS300MINIX	0xed06		/* GW-US300Mini-X/MiniW */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* Platronics DSP-400 Headset */
@@ -2132,6 +2220,7 @@
 #define	USB_PRODUCT_QCOM_RT2573	0x6196		/* RT2573 */
 #define	USB_PRODUCT_QCOM_RT2573_2	0x6229		/* RT2573 */
 #define	USB_PRODUCT_QCOM_RT2573_3	0x6238		/* RT2573 */
+#define	USB_PRODUCT_QCOM_RT2870	0x6259		/* RT2870 */
 
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
@@ -2149,6 +2238,9 @@
 /* Qualcomm Kyocera products */
 #define	USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K	0x17da		/* Qualcomm Kyocera CDMA Technologies MSM */
 
+/* Quanta products */
+#define	USB_PRODUCT_QUANTA_RT3070	0x0304		/* RT3070 */
+
 /* Quickshot products */
 #define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
 
@@ -2156,10 +2248,17 @@
 #define	USB_PRODUCT_RAINBOW_IKEY2000	0x1200		/* i-Key 2000 */
 
 /* Ralink Technology products */
+#define	USB_PRODUCT_QUANTA_RT3070	0x0304		/* RT3070 */
 #define	USB_PRODUCT_RALINK_RT2570	0x1706		/* RT2570 */
+#define	USB_PRODUCT_RALINK_RT2070	0x2070		/* RT2070 */
 #define	USB_PRODUCT_RALINK_RT2570_2	0x2570		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
+#define	USB_PRODUCT_RALINK_RT2770	0x2770		/* RT2770 */
+#define	USB_PRODUCT_RALINK_RT2870	0x2870		/* RT2870 */
+#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_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_2_RT2570	0x2570		/* RT2570 */
 #define	USB_PRODUCT_RALINK_2_RT2573	0x2573		/* RT2573 */
@@ -2226,6 +2325,7 @@
 
 /* Samsung products */
 #define	USB_PRODUCT_SAMSUNG_MIGHTYDRIVE	0x1623		/* Mighty Drive */
+#define	USB_PRODUCT_SAMSUNG_RT2870_1	0x2018		/* RT2870 */
 #define	USB_PRODUCT_SAMSUNG_ML6060	0x3008		/* ML-6060 laser printer */
 #define	USB_PRODUCT_SAMSUNG_GTB3710	0x6876		/* GT-B3710 LTE/4G datacard */
 #define	USB_PRODUCT_SAMSUNG_GTB3730	0x689a		/* GT-B3730 LTE/4G datacard */
@@ -2257,7 +2357,14 @@
 #define	USB_PRODUCT_SEALEVEL_SEAPORT4P4	0x2443		/* SeaPort+4 Port 4 */
 
 /* Senao products */
+#define	USB_PRODUCT_SENAO_RT2870_3	0x0605		/* RT2870 */
+#define	USB_PRODUCT_SENAO_RT2870_4	0x0615		/* RT2870 */
 #define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
+#define	USB_PRODUCT_SENAO_RT2870_1	0x9701		/* RT2870 */
+#define	USB_PRODUCT_SENAO_RT2870_2	0x9702		/* RT2870 */
+#define	USB_PRODUCT_SENAO_RT3070	0x9703		/* RT3070 */
+#define	USB_PRODUCT_SENAO_RT3071	0x9705		/* RT3071 */
+#define	USB_PRODUCT_SENAO_RT3072	0x9706		/* RT3072 */
 
 /* SGI products */
 #define	USB_PRODUCT_SGI_SN1_L1_SC	0x1234		/* SN1 L1 System Controller */
@@ -2383,6 +2490,17 @@
 #define	USB_PRODUCT_SITECOM_CN104	0x2068		/* CN104 serial */
 
 /* Sitecom Europe products */
+#define	USB_PRODUCT_SITECOMEU_RT2870_1	0x0017		/* RT2870 */
+#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_RT3070_3	0x003c		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_RT3070_4	0x003d		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_RT3070	0x003e		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_WL608	0x003f		/* WL-608 */
+#define	USB_PRODUCT_SITECOMEU_RT3072	0x0042		/* RT3072 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
 #define	USB_PRODUCT_SITECOMEU_ZD1211B	0x9075		/* ZD1211B */
@@ -2436,6 +2554,11 @@
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG	0x012e		/* KeikaiDenwa 8 with charger */
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8	0x039f		/* KeikaiDenwa 8 */
 
+/* SparkLAN products */
+#define	USB_PRODUCT_SPARKLAN_RT2573	0x0004		/* RT2573 */
+#define	USB_PRODUCT_SPARKLAN_RT2870_1	0x0006		/* RT2870 */
+#define	USB_PRODUCT_SPARKLAN_RT3070	0x0010		/* RT3070 */
+
 /* Sphairon Access Systems GmbH products */
 #define	USB_PRODUCT_SPHAIRON_UB801R	0x0110		/* UB801R */
 #define	USB_PRODUCT_SPHAIRON_RTL8187	0x0150		/* RTL8187 */
@@ -2486,6 +2609,8 @@
 
 /* Sweex products */
 #define	USB_PRODUCT_SWEEX_ZD1211	0x1809		/* ZD1211 */
+#define	USB_PRODUCT_SWEEX2_LW303	0x0302		/* LW303 */
+#define	USB_PRODUCT_SWEEX2_LW313	0x0313		/* LW313 */
 
 /* System TALKS, Inc. */
 #define	USB_PRODUCT_SYSTEMTALKS_SGCX2UL	0x1920		/* SGC-X2UL */
@@ -2576,6 +2701,7 @@
 #define	USB_PRODUCT_UMEDIA_TEW429UB_A	0x300a		/* TEW-429UB_A */
 #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_ALL0298V2	0x3204		/* ALL0298 v2 */
 
 /* Universal Access products */
@@ -2696,6 +2822,10 @@
 
 /* Zinwell products */
 #define	USB_PRODUCT_ZINWELL_ZWXG261	0x0260		/* ZWX-G261 */
+#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_RT3070	0x5257		/* RT3070 */
 
 /* Zoom Telephonics, Inc. products */
 #define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.561 src/sys/dev/usb/usbdevs_data.h:1.562
--- src/sys/dev/usb/usbdevs_data.h:1.561	Thu Nov  4 09:19:14 2010
+++ src/sys/dev/usb/usbdevs_data.h	Thu Nov 25 14:16:55 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.561 2010/11/04 09:19:14 pooka Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.562 2010/11/25 14:16:55 sborrill Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp
+ *	NetBSD: usbdevs,v 1.568 2010/11/25 14:16:24 sborrill Exp
  */
 
 /*
@@ -1471,6 +1471,10 @@
 	    "Sitecom Europe",
 	},
 	{
+	    USB_VENDOR_AMIGO,
+	    "Amigo Technology",
+	},
+	{
 	    USB_VENDOR_HAWKING,
 	    "Hawking",
 	},
@@ -1667,6 +1671,10 @@
 	    "Shark",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE,
+	    "AzureWave",
+	},
+	{
 	    USB_VENDOR_PHISON,
 	    "Phison Electronics Corp.",
 	},
@@ -1691,6 +1699,10 @@
 	    "Huawei-3Com",
 	},
 	{
+	    USB_VENDOR_ABOCOM2,
+	    "AboCom Systems",
+	},
+	{
 	    USB_VENDOR_SILICOM,
 	    "Silicom",
 	},
@@ -1731,6 +1743,14 @@
 	    "Fiberline",
 	},
 	{
+	    USB_VENDOR_AMIT2,
+	    "AMIT",
+	},
+	{
+	    USB_VENDOR_SPARKLAN,
+	    "SparkLAN",
+	},
+	{
 	    USB_VENDOR_SOHOWARE,
 	    "SOHOware",
 	},
@@ -1779,6 +1799,14 @@
 	    "Senao",
 	},
 	{
+	    USB_VENDOR_ASUSTEK2,
+	    "ASUSTeK Computer",
+	},
+	{
+	    USB_VENDOR_SWEEX2,
+	    "Sweex",
+	},
+	{
 	    USB_VENDOR_METAGEEK,
 	    "MetaGeek",
 	},
@@ -1807,10 +1835,22 @@
 	    "Qualcomm, Incorporated",
 	},
 	{
+	    USB_VENDOR_QUANTA,
+	    "Quanta",
+	},
+	{
 	    USB_VENDOR_WINCHIPHEAD2,
 	    "QinHeng Electronics",
 	},
 	{
+	    USB_VENDOR_PEGATRON,
+	    "Pegatron",
+	},
+	{
+	    USB_VENDOR_AIRTIES,
+	    "AirTies",
+	},
+	{
 	    USB_VENDOR_DLINK,
 	    "D-Link",
 	},
@@ -1819,6 +1859,10 @@
 	    "Planex Communications",
 	},
 	{
+	    USB_VENDOR_ENCORE,
+	    "Encore",
+	},
+	{
 	    USB_VENDOR_DLINK3,
 	    "D-Link",
 	},
@@ -1923,6 +1967,10 @@
 	    "3Com",
 	},
 	{
+	    USB_VENDOR_EDIMAX,
+	    "EDIMAX",
+	},
+	{
 	    USB_VENDOR_INTEL,
 	    "Intel",
 	},
@@ -1947,7 +1995,7 @@
 	    "GNU Radio USRP",
 	},
 };
-const int usb_nvendors = 477;
+const int usb_nvendors = 489;
 
 const struct usb_product usb_products[] = {
 	{
@@ -2015,6 +2063,30 @@
 	    "XX2",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2870,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT3071,
+	    "RT3071",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT3072,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_ABOCOM2, USB_PRODUCT_ABOCOM2_RT2870_1,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450,
 	    "URE450 Ethernet Adapter",
 	},
@@ -2347,6 +2419,10 @@
 	    "CDMA Wireless PC Card",
 	},
 	{
+	    USB_VENDOR_AIRTIES, USB_PRODUCT_AIRTIES_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    "USB-HASP 0.06",
 	},
@@ -2399,10 +2475,30 @@
 	    "TV Wonder 600 USB",
 	},
 	{
+	    USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO,
 	    "CG-WLUSB2GO",
 	},
 	{
+	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GNR,
+	    "CG-WLUSB2GNR",
+	},
+	{
+	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_AMIT2, USB_PRODUCT_AMIT2_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    "EZUSB",
 	},
@@ -2523,10 +2619,34 @@
 	    "WL-167g USB2.0 WLAN Adapter (version 2)",
 	},
 	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2870_5,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_MYPAL_A730,
 	    "MyPal A730",
 	},
 	{
+	    USB_VENDOR_ASUSTEK2, USB_PRODUCT_ASUSTEK2_USBN11,
+	    "USB-N11",
+	},
+	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    "Parallel printer adapter",
 	},
@@ -2655,6 +2775,18 @@
 	    "FRITZ!WLAN N",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER,
 	    "Card reader",
 	},
@@ -2731,10 +2863,30 @@
 	    "F5D705C 54g USB Network Adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D8053V3,
+	    "F5D8053 v3",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D8055,
+	    "F5D8055",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3,
 	    "F5D9050 ver 3",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6D4050V1,
+	    "F6D4050 ver 1",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    "USB100N 10/100 FastEthernet Adapter",
 	},
@@ -2983,10 +3135,42 @@
 	    "C54RU WLAN",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_7,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_8,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54RU2,
 	    "C54RU",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_5,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_RT2870_6,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
 	    "Eye Q 3x",
 	},
@@ -3039,6 +3223,22 @@
 	    "CG-WLUSB2GPX",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB300GNM,
+	    "CG-WLUSB300GNM",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
 	    "FEther USB-TXC",
 	},
@@ -3083,6 +3283,10 @@
 	    "TG54USB",
 	},
 	{
+	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    "mouse",
 	},
@@ -3471,6 +3675,18 @@
 	    "ANT dev board",
 	},
 	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7717,
+	    "EW-7717",
+	},
+	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7718,
+	    "EW-7718",
+	},
+	{
 	    USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
 	    "Touch Panel",
 	},
@@ -3555,6 +3771,10 @@
 	    "PSX gun controller converter",
 	},
 	{
+	    USB_VENDOR_ENCORE, USB_PRODUCT_ENCORE_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S,
 	    "1S serial connector",
 	},
@@ -3859,6 +4079,18 @@
 	    "GN-WI05GS",
 	},
 	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWB31N,
+	    "GN-WB31N",
+	},
+	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWB32L,
+	    "GN-WB32L",
+	},
+	{
 	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573,
 	    "RT2573",
 	},
@@ -3931,6 +4163,10 @@
 	    "HWGUSB2-54V2-AP",
 	},
 	{
+	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWNU300,
+	    "HWNU-300",
+	},
+	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    "FlashGate SmartMedia Card Reader",
 	},
@@ -3967,6 +4203,22 @@
 	    "WinTV USB FM",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_HWUN2,
+	    "HWUN2",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
 	    "10/100 USB Ethernet",
 	},
@@ -4795,6 +5047,18 @@
 	    "USB1000",
 	},
 	{
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB100,
+	    "WUSB100",
+	},
+	{
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB600N,
+	    "WUSB600N",
+	},
+	{
+	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GC_3,
+	    "WUSB54GC v3",
+	},
+	{
 	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2,
 	    "DVD Multi-plus unit LDR-H443SU2",
 	},
@@ -4815,6 +5079,18 @@
 	    "RTL8187",
 	},
 	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_3,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    "M2452 keyboard",
 	},
@@ -5063,10 +5339,22 @@
 	    "WLI-U2-KG54L",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCG300N,
+	    "WLI-UC-G300N",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCAG300N,
+	    "WLI-UC-AG300N",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCG,
 	    "WLI-UC-G",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGN,
+	    "WLI-UC-GN",
+	},
+	{
 	    USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620,
 	    "Merlin V620",
 	},
@@ -5091,6 +5379,10 @@
 	    "Bluetooth USB Adapter",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_MS6861,
 	    "MS-6861",
 	},
@@ -5931,6 +6223,18 @@
 	    "TY-TP50P6-S 50in Touch Panel",
 	},
 	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT2870,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070_2,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISKPRO,
 	    "USB Disk Pro",
 	},
@@ -6035,6 +6339,10 @@
 	    "DIVA USB mp3 player",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122,
 	    "hub",
 	},
@@ -6135,6 +6443,10 @@
 	    "RT3070",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS300MINIX,
+	    "GW-US300Mini-X/MiniW",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    "Platronics DSP-400 Headset",
 	},
@@ -6287,6 +6599,10 @@
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    "Scorpion-980N keyboard",
 	},
@@ -6327,6 +6643,10 @@
 	    "Qualcomm Kyocera CDMA Technologies MSM",
 	},
 	{
+	    USB_VENDOR_QUANTA, USB_PRODUCT_QUANTA_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
 	    "USB StrikePad",
 	},
@@ -6335,10 +6655,18 @@
 	    "i-Key 2000",
 	},
 	{
+	    USB_VENDOR_QUANTA, USB_PRODUCT_QUANTA_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570,
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2070,
+	    "RT2070",
+	},
+	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2,
 	    "RT2570",
 	},
@@ -6351,6 +6679,26 @@
 	    "RT2671",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2870,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3071,
+	    "RT3071",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3072,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
 	    "RT2570",
 	},
@@ -6551,6 +6899,10 @@
 	    "Mighty Drive",
 	},
 	{
+	    USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_RT2870_1,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_ML6060,
 	    "ML-6060 laser printer",
 	},
@@ -6627,10 +6979,38 @@
 	    "SeaPort+4 Port 4",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_4,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301,
 	    "NUB-8301",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3071,
+	    "RT3071",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT3072,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
 	    "SN1 L1 System Controller",
 	},
@@ -6991,6 +7371,50 @@
 	    "CN104 serial",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_2,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_3,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_4,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL608,
+	    "WL-608",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072,
+	    "RT3072",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028,
 	    "LN-028",
 	},
@@ -7151,6 +7575,18 @@
 	    "KeikaiDenwa 8",
 	},
 	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R,
 	    "UB801R",
 	},
@@ -7255,6 +7691,14 @@
 	    "ZD1211",
 	},
 	{
+	    USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW303,
+	    "LW303",
+	},
+	{
+	    USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW313,
+	    "LW313",
+	},
+	{
 	    USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL,
 	    "SGC-X2UL",
 	},
@@ -7431,6 +7875,10 @@
 	    "TEW-429UB C1",
 	},
 	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_RT2870_1,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2,
 	    "ALL0298 v2",
 	},
@@ -7743,6 +8191,22 @@
 	    "ZWX-G261",
 	},
 	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3072,
+	    "RT3072",
+	},
+	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    "2986L Fax modem",
 	},
@@ -7831,4 +8295,4 @@
 	    "Prestige",
 	},
 };
-const int usb_nproducts = 1470;
+const int usb_nproducts = 1574;

Reply via email to