summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorFelix Kronlage <fkr@cvs.openbsd.org>2006-12-07 12:16:31 +0000
committerFelix Kronlage <fkr@cvs.openbsd.org>2006-12-07 12:16:31 +0000
commitd2a66c6448fec82a2979a3f76acb3b481648fac0 (patch)
tree7b9698a91ce0ab17c633b9beb47a70f69836db10 /sys
parent6af2bb56e0344bb4756d1b9a949abf867f211aa6 (diff)
regenerated these with Merlin U740 id
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usbdevs.h5
-rw-r--r--sys/dev/usb/usbdevs_data.h8
2 files changed, 9 insertions, 4 deletions
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 $ */
@@ -3035,6 +3035,10 @@ const struct usb_known_product usb_known_products[] = {
"Merlin V620",
},
{
+ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740,
+ "Merlin U740",
+ },
+ {
USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
"C-1",
},