sync

2 files changed, 18 insertions, 5 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 8d2f246fef8..9b9069c168e 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.115 2004/10/16 01:13:33 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.116 2004/10/17 22:29:55 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.111 2004/10/16 01:11:56 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.112 2004/10/17 22:29:48 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -363,6 +363,7 @@
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
+#define	USB_VENDOR_ABC	0x0d8c		/* ABC */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology Inc. */
@@ -631,8 +632,8 @@
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXS	0x000d		/* FEther USB-TXS */
 #define	USB_PRODUCT_COREGA_WLANUSB	0x0012		/* Wireless LAN Stick-11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB2_TX	0x0017		/* FEther USB2-TX */
+#define	USB_PRODUCT_COREGA_WLUSB_11_KEY	0x001a		/* ULUSB-11 Key */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
-
 /* Creative Labs products */
 #define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II */
 #define	USB_PRODUCT_CREATIVE_NOMAD_IIMG	0x4004		/* Nomad II MG */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 5a427a6303a..f2c3fbde5a8 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.115 2004/10/16 01:13:33 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.116 2004/10/17 22:29:55 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.111 2004/10/16 01:11:56 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.112 2004/10/17 22:29:48 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -851,6 +851,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FEther USB2-TX",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_KEY,
+	    0,
+	    "Corega",
+	    "ULUSB-11 Key",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
 	    0,
 	    "Corega",
@@ -6341,6 +6347,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ABC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ABC",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MSI, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Micro Star International",