From d2a66c6448fec82a2979a3f76acb3b481648fac0 Mon Sep 17 00:00:00 2001
From: Felix Kronlage <fkr@cvs.openbsd.org>
Date: Thu, 7 Dec 2006 12:16:31 +0000
Subject: regenerated these with Merlin U740 id

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

(limited to 'sys/dev/usb')

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 0bbd66f0a01..146c7340426 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.245 2006/12/04 16:53:30 martin Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.246 2006/12/07 12:16:29 fkr Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.239 2006/12/04 16:52:52 martin Exp 
+ *	OpenBSD: usbdevs,v 1.240 2006/12/07 12:14:50 fkr Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1657,6 +1657,7 @@
 
 /* Novatel Wireless products */
 #define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* Merlin V620 */
+#define	USB_PRODUCT_NOVATEL_MERLINU740	0x1400		/* Merlin U740 */
 
 /* Olympus products */
 #define	USB_PRODUCT_OLYMPUS_C1	0x0102		/* C-1 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 441894b2279..3f4d4929649 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.243 2006/12/04 16:53:30 martin Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.244 2006/12/07 12:16:30 fkr Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.239 2006/12/04 16:52:52 martin Exp 
+ *	OpenBSD: usbdevs,v 1.240 2006/12/07 12:14:50 fkr Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -3034,6 +3034,10 @@ const struct usb_known_product usb_known_products[] = {
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV620,
 	    "Merlin V620",
 	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740,
+	    "Merlin U740",
+	},
 	{
 	    USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
 	    "C-1",
-- 
cgit v1.2.3