From: sthen <sthen@openbsd.org>
Date: Thu, 15 Jul 2010 15:45:15 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6e23ea760334536242477cf915e316f4a14a1761;p=openbsd

sync
---

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index b1e506b204e..8d6caf1a491 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.516 2010/07/02 15:34:25 sobrado Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.517 2010/07/15 15:45:15 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.506 2010/07/02 15:32:28 sobrado Exp 
+ *	OpenBSD: usbdevs,v 1.507 2010/07/15 15:44:55 sthen Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -563,6 +563,7 @@
 #define	USB_VENDOR_LONGCHEER	0x1c9e		/* Longcheer Technology */
 #define	USB_VENDOR_DRESDENELEC	0x1cf1		/* Dresden Elektronic */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
+#define	USB_VENDOR_METAGEEK	0x1dd5		/* MetaGeek */
 #define	USB_VENDOR_MODACOM	0x1eb8		/* Modacom */
 #define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
@@ -2521,6 +2522,9 @@
 #define	USB_PRODUCT_MECANIQUE_WISPY	0x083e		/* MetaGeek Wi-Spy */
 #define	USB_PRODUCT_MECANIQUE_TELLSTICK	0x0c30		/* Telldus Tellstick */
 
+/* MetaGeek products */
+#define	USB_PRODUCT_METAGEEK_WISPY24I	0x2400		/* Wi-Spy 2.4i */
+
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 93b600c393f..29b8519b27e 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.510 2010/07/02 15:34:25 sobrado Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.511 2010/07/15 15:45:15 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.506 2010/07/02 15:32:28 sobrado Exp 
+ *	OpenBSD: usbdevs,v 1.507 2010/07/15 15:44:55 sthen Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -5845,6 +5845,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_TELLSTICK,
 	    "Telldus Tellstick",
 	},
+	{
+	    USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24I,
+	    "Wi-Spy 2.4i",
+	},
 	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    "Ricochet GS",
@@ -11329,6 +11333,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    USB_VENDOR_PEGATRON,
 	    "Pegatron",
 	},
+	{
+	    USB_VENDOR_METAGEEK,
+	    "MetaGeek",
+	},
 	{
 	    USB_VENDOR_MODACOM,
 	    "Modacom",