sync

2 files changed, 18 insertions, 8 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 2a0d02c22d9..e3145f9fc04 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.330 2007/12/05 17:12:33 sthen Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.331 2007/12/07 05:05:05 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.320 2007/12/04 23:44:55 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.322 2007/12/07 05:05:02 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1158,8 +1158,8 @@
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial */
 #define	USB_PRODUCT_FTDI_MJS_SIRIUS_PC	0xca81		/* MJS Sirius To PC Interface */
 #define	USB_PRODUCT_FTDI_DCF	0xe88a		/* Expert mouseCLOCK USB II */
-#define	USB_PRODUCT_FTDI_MSF	0xe88b		/* Expert mouseCLOCK UBS II MSF */
-#define	USB_PRODUCT_FTDI_HBG	0xe88c		/* Expert mouseCLOCK UBS II HBG */
+#define	USB_PRODUCT_FTDI_MSF	0xe88b		/* Expert mouseCLOCK USB II MSF */
+#define	USB_PRODUCT_FTDI_HBG	0xe88c		/* Expert mouseCLOCK USB II HBG */
 #define	USB_PRODUCT_FTDI_SERIAL_232BM	0xee18		/* FT232BM Serial */
 #define	USB_PRODUCT_FTDI_MHAM_KW	0xeee8		/* KW */
 #define	USB_PRODUCT_FTDI_MHAM_YS	0xeee9		/* YS */
@@ -1901,6 +1901,7 @@
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
 #define	USB_PRODUCT_PLANEX2_GWUS54GD	0xed01		/* GW-US54GD */
 #define	USB_PRODUCT_PLANEX2_GWUSMM	0xed02		/* GW-USMM */
+#define	USB_PRODUCT_PLANEX3_GWUS54GZ	0xab10		/* GW-US54GZ */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* DSP-400 Headset */
@@ -2475,6 +2476,7 @@
 /* ZyXEL Communication Co. products */
 #define	USB_PRODUCT_ZYXEL_OMNI56K	0x1500		/* Omni 56K Plus */
 #define	USB_PRODUCT_ZYXEL_980N	0x2011		/* Scorpion-980N */
+#define	USB_PRODUCT_ZYXEL_G200V2	0x3407		/* G-200 v2 */
 #define	USB_PRODUCT_ZYXEL_ZYAIRG220	0x3401		/* ZyAIR G-220 */
 #define	USB_PRODUCT_ZYXEL_AG225H	0x3409		/* AG-225H */
 #define	USB_PRODUCT_ZYXEL_M202	0x340a		/* M-202 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 00af4e4f9a6..5367cf0ce6b 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.326 2007/12/05 17:12:33 sthen Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.327 2007/12/07 05:05:05 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.320 2007/12/04 23:44:55 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.322 2007/12/07 05:05:02 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1642,11 +1642,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MSF,
-	    "Expert mouseCLOCK UBS II MSF",
+	    "Expert mouseCLOCK USB II MSF",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_HBG,
-	    "Expert mouseCLOCK UBS II HBG",
+	    "Expert mouseCLOCK USB II HBG",
 	},
 	{
 	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232BM,
@@ -3677,6 +3677,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-USMM",
 	},
 	{
+	    USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ,
+	    "GW-US54GZ",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    "DSP-400 Headset",
 	},
@@ -5073,6 +5077,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Scorpion-980N",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2,
+	    "G-200 v2",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220,
 	    "ZyAIR G-220",
 	},