From d9a3f1256d9f3713dffb2640546f03d48b2192b2 Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Sat, 16 Oct 2010 11:57:47 +0000
Subject: Sync

---
 sys/dev/usb/usbdevs.h      |  6 ++++--
 sys/dev/usb/usbdevs_data.h | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'sys/dev/usb')

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 2e02a405c13..6f6a40b27d4 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.528 2010/10/12 21:06:50 mpf Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.529 2010/10/16 11:57:46 krw Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.518 2010/10/12 21:05:44 mpf Exp 
+ *	OpenBSD: usbdevs,v 1.519 2010/10/16 11:55:00 krw Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2531,6 +2531,7 @@
 #define	USB_PRODUCT_MELCO_RT2870_1	0x0148		/* RT2870 */
 #define	USB_PRODUCT_MELCO_RT2870_2	0x0150		/* RT2870 */
 #define	USB_PRODUCT_MELCO_WLIUCGN	0x015d		/* WLI-UC-GN */
+#define	USB_PRODUCT_MELCO_WLIUCGNM	0x01a2		/* WLI-UC-GNM */
 
 /* MetaGeek tagged products */
 #define	USB_PRODUCT_MECANIQUE_WISPY	0x083e		/* MetaGeek Wi-Spy */
@@ -2952,6 +2953,7 @@
 #define	USB_PRODUCT_PLANEX3_GWUS54GZ	0xab10		/* GW-US54GZ */
 #define	USB_PRODUCT_PLANEX2_GWUS300MINIS	0xab24		/* GW-US300MiniS */
 #define	USB_PRODUCT_PLANEX2_RT3070	0xab25		/* RT3070 */
+#define	USB_PRODUCT_PLANEX2_GWUSMICRO300	0xab29		/* GW-USMicro300 */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* DSP-400 Headset */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 18035beefcf..9bdad892ca5 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.522 2010/10/12 21:06:50 mpf Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.523 2010/10/16 11:57:46 krw Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.518 2010/10/12 21:05:44 mpf Exp 
+ *	OpenBSD: usbdevs,v 1.519 2010/10/16 11:55:00 krw Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -5873,6 +5873,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGN,
 	    "WLI-UC-GN",
 	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNM,
+	    "WLI-UC-GNM",
+	},
 	{
 	    USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY,
 	    "MetaGeek Wi-Spy",
@@ -7049,6 +7053,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RT3070,
 	    "RT3070",
 	},
+	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMICRO300,
+	    "GW-USMicro300",
+	},
 	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    "DSP-400 Headset",
-- 
cgit v1.2.3