From: deraadt <deraadt@openbsd.org>
Date: Tue, 26 Aug 2008 22:25:08 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d33c49254cda042f669e9d7ea4409f8339bf7550;p=openbsd

sync
---

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index a2c10b24641..a9cf0cfe049 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.388 2008/08/19 02:34:08 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.389 2008/08/26 22:25:08 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.378 2008/08/19 02:34:04 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.379 2008/08/26 22:24:30 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -276,6 +276,7 @@
 #define	USB_VENDOR_DIGITALSTREAM	0x074e		/* Digital Stream */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
+#define	USB_VENDOR_CYBERPOWER	0x0764		/* CyberPower */
 #define	USB_VENDOR_SURECOM	0x0769		/* Surecom Technology */
 #define	USB_VENDOR_LINKSYS2	0x077b		/* Linksys */
 #define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology */
@@ -1046,6 +1047,9 @@
 /* CTX products */
 #define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
 
+/* CyberPower products */
+#define	USB_PRODUCT_CYBERPOWER_1500	0x0501		/* 1500 */
+
 /* CyberTAN Technology products */
 #define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
 #define	USB_PRODUCT_CYBERTAN_RT2870	0x1828		/* RT2870 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 186c37a315c..f37a67dbf57 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.382 2008/08/19 02:34:08 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.383 2008/08/26 22:25:08 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.378 2008/08/19 02:34:04 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.379 2008/08/26 22:24:30 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1313,6 +1313,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300,
 	    "Ex1300 hub",
 	},
+	{
+	    USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500,
+	    "1500",
+	},
 	{
 	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB,
 	    "TG54USB",
@@ -7457,6 +7461,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    USB_VENDOR_MIDIMAN,
 	    "Midiman",
 	},
+	{
+	    USB_VENDOR_CYBERPOWER,
+	    "CyberPower",
+	},
 	{
 	    USB_VENDOR_SURECOM,
 	    "Surecom Technology",