From 2dd7d5becd99b3dce71d4fea7ae725d1c4054a37 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@cvs.openbsd.org>
Date: Sun, 14 Dec 2008 00:36:07 +0000
Subject: regen

---
 sys/dev/usb/usbdevs.h      | 5 +++--
 sys/dev/usb/usbdevs_data.h | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index bd05afb5936..0e9fc99f126 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.409 2008/12/11 10:44:36 fkr Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.410 2008/12/14 00:36:06 brad Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.399 2008/12/11 10:43:38 fkr Exp 
+ *	OpenBSD: usbdevs,v 1.400 2008/12/14 00:34:45 brad Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2130,6 +2130,7 @@
 #define	USB_PRODUCT_NOVATEL_XU870	0x1430		/* XU870 */
 #define	USB_PRODUCT_NOVATEL_ES620	0x2100		/* ES620 CDMA */
 #define	USB_PRODUCT_NOVATEL_U720	0x2110		/* U720 */
+#define	USB_PRODUCT_NOVATEL_MERLINX950D	0x5010		/* Merlin X950D */
 
 /* Novatel Wireless(1) products */
 #define	USB_PRODUCT_NOVATEL1_FLEXPACKGPS	0x0100		/* NovAtel FlexPack GPS */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 161e1b3fd33..3439ea18a58 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.403 2008/12/11 10:44:36 fkr Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.404 2008/12/14 00:36:06 brad Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.399 2008/12/11 10:43:38 fkr Exp 
+ *	OpenBSD: usbdevs,v 1.400 2008/12/14 00:34:45 brad Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -4373,6 +4373,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720,
 	    "U720",
 	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINX950D,
+	    "Merlin X950D",
+	},
 	{
 	    USB_VENDOR_NOVATEL1, USB_PRODUCT_NOVATEL1_FLEXPACKGPS,
 	    "NovAtel FlexPack GPS",
-- 
cgit v1.2.3