sync

2 files changed, 26 insertions, 26 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 9b64de02bd1..0c20386dbbc 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.162 2005/07/07 02:12:24 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.163 2005/07/07 06:35:17 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.158 2005/07/07 02:11:20 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.159 2005/07/07 06:35:13 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -195,7 +195,7 @@
 #define	USB_VENDOR_QUALCOMM	0x05c6		/* Qualcomm */
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix */
 #define	USB_VENDOR_ELSA	0x05cc		/* ELSA */
-#define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
+#define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes */
 #define	USB_VENDOR_ULTIMA	0x05d8		/* Ultima */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
@@ -269,7 +269,7 @@
 #define	USB_VENDOR_BRIMAX	0x078e		/* Brimax */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications */
 #define	USB_VENDOR_ABL	0x0794		/* ABL Electronics */
-#define	USB_VENDOR_SUNCOMM	0x079c		/* Sun Communications, Inc. */
+#define	USB_VENDOR_SUNCOMM	0x079c		/* Sun Communications */
 #define	USB_VENDOR_ALFADATA	0x079d		/* Alfadata Computer */
 #define	USB_VENDOR_NATIONALTECH	0x07a2		/* National Technical Systems */
 #define	USB_VENDOR_ONNTO	0x07a3		/* Onnto */
@@ -366,7 +366,7 @@
 #define	USB_VENDOR_HAL	0x0b41		/* HAL Corporation */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
-#define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics, Inc. */
+#define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics */
 #define	USB_VENDOR_ASIX	0x0b95		/* ASIX Electronics */
 #define	USB_VENDOR_USR	0x0baf		/* U.S. Robotics */
 #define	USB_VENDOR_AMBIT	0x0bb2		/* Ambit Microsystems */
@@ -385,7 +385,7 @@
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
-#define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology Inc. */
+#define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications GmbH */
@@ -395,7 +395,7 @@
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
-#define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices, Inc. */
+#define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices */
 #define	USB_VENDOR_JRC	0x1145		/* Japan Radio Company */
 #define	USB_VENDOR_SERVERWORKS	0x1166		/* ServerWorks */
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
@@ -1704,7 +1704,7 @@
 #define	USB_PRODUCT_SONY_CLIE_35	0x0038		/* Clie v3.5 */
 #define	USB_PRODUCT_SONY_PS2KEYBOARD	0x005c		/* PlayStation2 keyboard */
 #define	USB_PRODUCT_SONY_PS2KEYBOARDHUB	0x005d		/* PlayStation2 keyboard hub */
-#define	USB_PRODUCT_SONY_PS2MOUSE	0x0061		/* PlayStatoin2 mouse */
+#define	USB_PRODUCT_SONY_PS2MOUSE	0x0061		/* PlayStation2 mouse */
 #define	USB_PRODUCT_SONY_CLIE_40	0x0066		/* Clie v4.0 */
 #define	USB_PRODUCT_SONY_CLIE_40_MS	0x006d		/* Clie v4.0 Memory Stick slot */
 #define	USB_PRODUCT_SONY_CLIE_S360	0x0095		/* Sony Clie s360 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 2784e557272..f0717a329da 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.161 2005/07/07 02:12:24 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.162 2005/07/07 06:35:17 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.158 2005/07/07 02:11:20 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.159 2005/07/07 06:35:13 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -529,49 +529,49 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle I",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI_NF,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle I",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle II",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII_NF,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle II",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle IIC",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC_NF,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle IIC",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle III",
 	},
 	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII_NF,
 	    0,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    "Eagle III",
 	},
 	{
@@ -3853,7 +3853,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
 	    0,
-	    "Ours Technology Inc.",
+	    "Ours Technology",
 	    "Solid state disk",
 	},
 	{
@@ -4862,7 +4862,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_PS2MOUSE,
 	    0,
 	    "Sony",
-	    "PlayStatoin2 mouse",
+	    "PlayStation2 mouse",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40,
@@ -4933,7 +4933,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SUNCOMM, USB_PRODUCT_SUNCOMM_MB_ADAPTOR,
 	    0,
-	    "Sun Communications, Inc.",
+	    "Sun Communications",
 	    "Mobile Adaptor",
 	},
 	{
@@ -6265,7 +6265,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BRAINBOXES, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brainboxes Limited",
+	    "Brainboxes",
 	    NULL,
 	},
 	{
@@ -6709,7 +6709,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SUNCOMM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Sun Communications, Inc.",
+	    "Sun Communications",
 	    NULL,
 	},
 	{
@@ -7291,7 +7291,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_KURUSUGAWA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Kurusugawa Electronics, Inc.",
+	    "Kurusugawa Electronics",
 	    NULL,
 	},
 	{
@@ -7405,7 +7405,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_OTI, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Ours Technology Inc.",
+	    "Ours Technology",
 	    NULL,
 	},
 	{
@@ -7465,7 +7465,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANALOG, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Analog Devices, Inc.",
+	    "Analog Devices",
 	    NULL,
 	},
 	{