summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-10-23 17:03:57 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-10-23 17:03:57 +0000
commitedd2a689ef016feb3553d3c4aec69b9e36724e46 (patch)
treed96644d71ba540dd0274531bd06226ecdd09e0fa
parent4704c0d7a61db7d2c042a56c6dd0782288e8ecb1 (diff)
sync
-rw-r--r--sys/dev/usb/usbdevs.h8
-rw-r--r--sys/dev/usb/usbdevs_data.h12
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 7aa722398df..b49eb8501b8 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.314 2007/10/22 19:38:04 deraadt Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.315 2007/10/23 17:03:55 mbalmer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.305 2007/10/22 19:37:28 deraadt Exp
+ * OpenBSD: usbdevs,v 1.306 2007/10/23 17:03:22 mbalmer Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -501,6 +501,7 @@
#define USB_VENDOR_AMIT 0x18c5 /* AMIT */
#define USB_VENDOR_QCOM 0x18e8 /* Qcom */
#define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */
+#define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */
#define USB_VENDOR_DLINK 0x2001 /* D-Link */
#define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */
#define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */
@@ -1570,6 +1571,9 @@
#define USB_PRODUCT_MCT_SITECOM_USB232 0x0230 /* Sitecom RS232 */
#define USB_PRODUCT_MCT_ML_4500 0x0302 /* ML-4500 */
+/* Meinberg Funkuhren products */
+#define USB_PRODUCT_MEINBERG_USB5131 0x0301 /* USB 5131 DCF77 - Radio Clock */
+
/* Melco, Inc products */
#define USB_PRODUCT_MELCO_LUATX1 0x0001 /* LUA-TX Ethernet */
#define USB_PRODUCT_MELCO_LUATX5 0x0005 /* LUA-TX Ethernet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 49c501c8456..3a283ad65ad 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.311 2007/10/22 19:38:04 deraadt Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.312 2007/10/23 17:03:56 mbalmer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.305 2007/10/22 19:37:28 deraadt Exp
+ * OpenBSD: usbdevs,v 1.306 2007/10/23 17:03:22 mbalmer Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -2773,6 +2773,10 @@ const struct usb_known_product usb_known_products[] = {
"ML-4500",
},
{
+ USB_VENDOR_MEINBERG, USB_PRODUCT_MEINBERG_USB5131,
+ "USB 5131 DCF77 - Radio Clock",
+ },
+ {
USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
"LUA-TX Ethernet",
},
@@ -6789,6 +6793,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"Linksys",
},
{
+ USB_VENDOR_MEINBERG,
+ "Meinberg Funkuhren",
+ },
+ {
USB_VENDOR_DLINK,
"D-Link",
},