regen

2 files changed, 26 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 27598646c12..1569e1f1180 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.187 2006/02/12 00:09:00 miod Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.188 2006/02/16 10:44:43 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.183 2006/02/12 00:08:52 miod Exp 
+ *	OpenBSD: usbdevs,v 1.184 2006/02/16 10:44:01 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -379,6 +379,7 @@
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_SEALEVEL	0x0c52		/* Sealevel System */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
+#define	USB_VENDOR_KYOCERA2	0x0c88		/* Kyocera */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_SMC3	0x0d5c		/* SMC */
@@ -416,6 +417,7 @@
 #define	USB_VENDOR_DICKSMITH	0x1371		/* Dick Smith Electronics */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
+#define	USB_VENDOR_NOVATEL	0x1410		/* Novatel Wireless */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x148f		/* Ralink Technology */
 #define	USB_VENDOR_CONCEPTRONIC2	0x14b2		/* Conceptronic */
@@ -1219,6 +1221,7 @@
 
 /* Kyocera products */
 #define	USB_PRODUCT_KYOCERA_AHK3001V	0x0203		/* AH-K3001V */
+#define	USB_PRODUCT_KYOCERA2_KPC650	0x17da		/* KPC650 EVDO */
 
 /* LaCie products */
 #define	USB_PRODUCT_LACIE_HD	0xa601		/* Hard Disk */
@@ -1442,6 +1445,9 @@
 /* NHJ product */
 #define	USB_PRODUCT_NHJ_CAM2	0x9120		/* Camera */
 
+/* Novatel Wireless products */
+#define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* Merlin V620 */
+
 /* Olympus products */
 #define	USB_PRODUCT_OLYMPUS_C1	0x0102		/* C-1 */
 #define	USB_PRODUCT_OLYMPUS_C700	0x0105		/* C-700 Ultra Zoom */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index b32fd77dc17..20130ce5f10 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.187 2006/02/12 00:09:00 miod Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.188 2006/02/16 10:44:43 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.183 2006/02/12 00:08:52 miod Exp 
+ *	OpenBSD: usbdevs,v 1.184 2006/02/16 10:44:01 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1967,6 +1967,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "AH-K3001V",
 	},
 	{
+	    USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_KPC650,
+	    "KPC650 EVDO",
+	},
+	{
 	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD,
 	    "Hard Disk",
 	},
@@ -2583,6 +2587,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Camera",
 	},
 	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV620,
+	    "Merlin V620",
+	},
+	{
 	    USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
 	    "C-1",
 	},
@@ -5063,6 +5071,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "EasyDisk",
 	},
 	{
+	    USB_VENDOR_KYOCERA2,
+	    "Kyocera",
+	},
+	{
 	    USB_VENDOR_ZCOM,
 	    "Z-Com",
 	},
@@ -5211,6 +5223,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Shark",
 	},
 	{
+	    USB_VENDOR_NOVATEL,
+	    "Novatel Wireless",
+	},
+	{
 	    USB_VENDOR_SILICOM,
 	    "Silicom",
 	},