From: deraadt <deraadt@openbsd.org>
Date: Wed, 30 Jul 2008 15:51:01 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=87196b17efdd0b78940c2cb2467a63577d67a44b;p=openbsd

sync
---

diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c
index 0b75e4ec5fa..56ed95c2e13 100644
--- a/sys/dev/usb/ukbdmap.c
+++ b/sys/dev/usb/ukbdmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbdmap.c,v 1.31 2008/06/26 05:42:18 ray Exp $	*/
+/*	$OpenBSD: ukbdmap.c,v 1.32 2008/07/30 15:53:37 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMAGICALLY GENERATED.  DO NOT EDIT.
@@ -7,12 +7,11 @@
  *	OpenBSD: makemap.awk,v 1.8 2008/05/19 18:09:06 miod Exp 
  * generated from:
  */
-/*	OpenBSD: wskbdmap_mfii.c,v 1.35 2008/03/21 17:10:46 miod Exp  */
+/*	OpenBSD: wskbdmap_mfii.c,v 1.38 2008/07/30 15:53:31 deraadt Exp  */
 /*	$NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $	*/
 
 /*
  * PLEASE DO NOT FORGET TO REGEN
- *	sys/arch/hppa/gsc/gsckbdmap.c
  *	sys/dev/usb/ukbdmap.c
  * AFTER ANY CHANGES TO THIS FILE!
  */
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index f688ef34645..720e8359249 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.385 2008/07/30 15:40:39 canacar Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.386 2008/07/30 15:51:01 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.374 2008/07/04 15:06:54 yuo Exp 
+ *	OpenBSD: usbdevs,v 1.375 2008/07/12 16:22:55 bernd Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 0cd780da66e..dd448a7468b 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.379 2008/07/12 16:23:40 bernd Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.380 2008/07/30 15:51:01 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.374 2008/07/04 15:06:54 yuo Exp 
+ *	OpenBSD: usbdevs,v 1.375 2008/07/12 16:22:55 bernd Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -5473,6 +5473,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725,
 	    "MC5725",
 	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725_2,
+	    "MC5725",
+	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_580,
 	    "Aircard 580 EVDO",