From: deraadt <deraadt@openbsd.org>
Date: Wed, 27 Aug 2008 17:33:32 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c03c2e9b63e8c824030a284b71ab77a542e1fe81;p=openbsd

sync
---

diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 273840e65b8..24899f9c031 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_quirks.c,v 1.46 2008/08/26 22:25:20 deraadt Exp $ */
+/*	$OpenBSD: usb_quirks.c,v 1.47 2008/08/27 17:33:32 deraadt Exp $ */
 /*	$NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
@@ -133,6 +133,7 @@ const struct usbd_quirk_entry {
  { USB_VENDOR_TENX, USB_PRODUCT_TENX_MISSILE,	    ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,	    ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY,   { UQ_BAD_HID }},
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,    ANY,    { UQ_BAD_HID }},
  { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,	    ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2,	    ANY,   { UQ_BAD_HID }},
  { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500,	ANY,	{ UQ_BAD_HID }},
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index a9cf0cfe049..2a80272290f 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.389 2008/08/26 22:25:08 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.390 2008/08/27 17:33:32 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.379 2008/08/26 22:24:30 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.380 2008/08/27 17:33:30 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -894,6 +894,7 @@
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
 #define	USB_PRODUCT_BELKIN_F5D5055	0x5055		/* F5D5055 */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_F6C1500EITWRK	0x0751		/* F6C1500EITW-RK UPS */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_RT2870	0x8053		/* RT2870 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index f37a67dbf57..fd712c69149 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.383 2008/08/26 22:25:08 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.384 2008/08/27 17:33:33 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.379 2008/08/26 22:24:30 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.380 2008/08/27 17:33:30 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -905,6 +905,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050,
 	    "F5D7050 54g USB Network Adapter",
 	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,
+	    "F6C1500EITW-RK UPS",
+	},
 	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A,
 	    "F5D705A 54g USB Network Adapter",