sync

2 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index d85dbaa5a4f..a77a9a2d7d2 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.320 2007/11/11 10:21:42 martin Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.321 2007/11/12 04:10:48 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.311 2007/11/11 02:14:24 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.312 2007/11/12 04:10:09 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2176,23 +2176,23 @@
 #define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Keyboard */
 
 /* SONY products */
-#define	USB_PRODUCT_SONY_DSC	0x0010		/* Sony DSC Cameras */
+#define	USB_PRODUCT_SONY_DSC	0x0010		/* DSC Cameras */
 #define	USB_PRODUCT_SONY_NWMS7	0x0025		/* Memorystick NW-MS7 */
 #define	USB_PRODUCT_SONY_DRIVEV2	0x002b		/* Harddrive V2 */
 #define	USB_PRODUCT_SONY_MSACUS1	0x002d		/* Memorystick MSAC-US1 */
 #define	USB_PRODUCT_SONY_HANDYCAM	0x002e		/* Handycam */
-#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC Memorystick */
+#define	USB_PRODUCT_SONY_MSC	0x0032		/* MSC Memorystick */
 #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		/* 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 */
-#define	USB_PRODUCT_SONY_CLIE_S360	0x0095		/* Sony Clie s360 */
+#define	USB_PRODUCT_SONY_CLIE_S360	0x0095		/* Clie s360 */
 #define	USB_PRODUCT_SONY_CLIE_41_MS	0x0099		/* Clie v4.1 Memory Stick */
 #define	USB_PRODUCT_SONY_CLIE_41	0x009a		/* Clie v4.1 */
-#define	USB_PRODUCT_SONY_CLIE_NX60	0x00da		/* Sony Clie nx60 */
-#define	USB_PRODUCT_SONY_CLIE_TJ25	0x0169		/* Sony Clie tj25 */
+#define	USB_PRODUCT_SONY_CLIE_NX60	0x00da		/* Clie nx60 */
+#define	USB_PRODUCT_SONY_CLIE_TJ25	0x0169		/* Clie tj25 */
 
 /* SOURCENEXT products */
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8	0x039f		/* KeikaiDenwa 8 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index bd18b924b3d..561cd50855a 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.317 2007/11/11 10:21:42 martin Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.318 2007/11/12 04:10:48 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.311 2007/11/11 02:14:24 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.312 2007/11/12 04:10:09 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -4370,7 +4370,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
-	    "Sony DSC Cameras",
+	    "DSC Cameras",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_NWMS7,
@@ -4390,7 +4390,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
-	    "Sony MSC Memorystick",
+	    "MSC Memorystick",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35,
@@ -4418,7 +4418,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360,
-	    "Sony Clie s360",
+	    "Clie s360",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41_MS,
@@ -4430,11 +4430,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60,
-	    "Sony Clie nx60",
+	    "Clie nx60",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25,
-	    "Sony Clie tj25",
+	    "Clie tj25",
 	},
 	{
 	    USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8,