From dd16446e731ab5b42e681f15df703b6434d906b9 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 6 Nov 2010 00:09:17 +0000
Subject: sync

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

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 64277685d2d..9ef30acbcfe 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.530 2010/10/23 18:38:41 damien Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.532 2010/11/06 00:12:39 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.520 2010/10/23 18:37:46 damien Exp 
+ *	OpenBSD: usbdevs,v 1.522 2010/11/06 00:12:32 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2180,6 +2180,7 @@
 #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_RT3020	0x0168		/* RT3020 */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
@@ -2973,6 +2974,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_GWUSNANO	0xab28		/* GW-USNano */
 #define	USB_PRODUCT_PLANEX2_GWUSMICRO300	0xab29		/* GW-USMicro300 */
 
 /* Plantronics products */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index cf4c6e1dcde..ba32b9baa04 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.524 2010/10/23 18:38:41 damien Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.526 2010/11/06 00:12:39 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.520 2010/10/23 18:37:46 damien Exp 
+ *	OpenBSD: usbdevs,v 1.522 2010/11/06 00:12:32 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -4549,6 +4549,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_3,
 	    "RT2870",
 	},
+	{
+	    USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT3020,
+	    "RT3020",
+	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    "M2452 keyboard",
@@ -7125,6 +7129,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RT3070,
 	    "RT3070",
 	},
+	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSNANO,
+	    "GW-USNano",
+	},
 	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMICRO300,
 	    "GW-USMicro300",
-- 
cgit v1.2.3-59-g8ed1b