From: mk <mk@openbsd.org>
Date: Mon, 26 Jul 2010 22:15:50 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=87e4a33435d458d70111198051ec1fc4ba8ecbdc;p=openbsd

sync
---

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index bd382bbe0ff..a43aa49a92c 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.519 2010/07/25 11:20:37 mglocker Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.520 2010/07/26 22:15:50 mk Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.508 2010/07/19 05:12:49 jakemsr Exp 
+ *	OpenBSD: usbdevs,v 1.510 2010/07/26 22:15:19 mk Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2586,6 +2586,7 @@
 #define	USB_PRODUCT_MICROSOFT_WLNOTEBOOK3	0x00d2		/* Wireless Optical Mouse 3000 (Model 1049) */
 #define	USB_PRODUCT_MICROSOFT_WLNOTEBOOK2	0x00e1		/* Wireless Optical Mouse 3000 (Model 1056) */
 #define	USB_PRODUCT_MICROSOFT_XBOX360	0x0292		/* XBOX 360 WLAN */
+#define	USB_PRODUCT_MICROSOFT_LIFECAM	0x074a		/* Microsoft LifeCam */
 
 /* Microtech products */
 #define	USB_PRODUCT_MICROTECH_SCSIDB25	0x0004		/* SCSI-DB25 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index a42488c9a45..446cc545289 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.513 2010/07/25 11:20:37 mglocker Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.514 2010/07/26 22:15:50 mk Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.508 2010/07/19 05:12:49 jakemsr Exp 
+ *	OpenBSD: usbdevs,v 1.510 2010/07/26 22:15:19 mk Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -6041,6 +6041,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX360,
 	    "XBOX 360 WLAN",
 	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_LIFECAM,
+	    "Microsoft LifeCam",
+	},
 	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,
 	    "SCSI-DB25",