PERFORCE change 155171 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=155171

Change 155171 by hselasky at hselasky_laptop001 on 2008/12/23 14:52:39

	
	IFC @155167 - step two - fix compilation

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usbdevs#31 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#17 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#31 (text+ko) ====

@@ -205,7 +205,7 @@
 vendor NEWNEX		0x04f7	Newnex
 vendor BROTHER		0x04f9	Brother Industries
 vendor DALLAS		0x04fa	Dallas Semiconductor
-vendor AIPTEK2		0x04fc	AIPTEK International
+vendor SUNPLUS		0x04fc	AIPTEK International
 vendor PFU		0x04fe	PFU
 vendor FUJIKURA		0x0501	Fujikura/DDK
 vendor ACER		0x0502	Acer
@@ -503,7 +503,7 @@
 vendor FSC		0x0bf8	Fujitsu Siemens Computers
 vendor AGATE		0x0c08	Agate Technologies
 vendor DMI		0x0c0b	DMI
-vendor CHICONY2		0x0c45	Chicony
+vendor MICRODIA		0x0c45	Chicony
 vendor SEALEVEL		0x0c52	Sealevel System
 vendor LUWEN		0x0c76	Luwen
 vendor KYOCERA2		0x0c88	Kyocera Wireless Corp.

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#17 (text+ko) ====

@@ -212,7 +212,7 @@
 #define	USB_VENDOR_NEWNEX	0x04f7		/* Newnex */
 #define	USB_VENDOR_BROTHER	0x04f9		/* Brother Industries */
 #define	USB_VENDOR_DALLAS	0x04fa		/* Dallas Semiconductor */
-#define	USB_VENDOR_AIPTEK2	0x04fc		/* AIPTEK International */
+#define	USB_VENDOR_SUNPLUS	0x04fc		/* AIPTEK International */
 #define	USB_VENDOR_PFU	0x04fe		/* PFU */
 #define	USB_VENDOR_FUJIKURA	0x0501		/* Fujikura/DDK */
 #define	USB_VENDOR_ACER	0x0502		/* Acer */
@@ -510,7 +510,7 @@
 #define	USB_VENDOR_FSC	0x0bf8		/* Fujitsu Siemens Computers */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
-#define	USB_VENDOR_CHICONY2	0x0c45		/* Chicony */
+#define	USB_VENDOR_MICRODIA	0x0c45		/* Chicony */
 #define	USB_VENDOR_SEALEVEL	0x0c52		/* Sealevel System */
 #define	USB_VENDOR_LUWEN	0x0c76		/* Luwen */
 #define	USB_VENDOR_KYOCERA2	0x0c88		/* Kyocera Wireless Corp. */

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#17 (text+ko) ====

@@ -601,7 +601,7 @@
 	{
 	    USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3,
 	    0,
-	    "",
+	    "AIPTEK International",
 	    "PenCam Mega 1.3",
 	},
 	{
@@ -1405,7 +1405,7 @@
 	{
 	    USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM,
 	    0,
-	    "",
+	    "Chicony",
 	    "TwinkleCam USB camera",
 	},
 	{
@@ -8165,7 +8165,7 @@
 	    NULL,
 	},
 	{
-	    USB_VENDOR_AIPTEK2, 0,
+	    USB_VENDOR_SUNPLUS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "AIPTEK International",
 	    NULL,
@@ -9953,7 +9953,7 @@
 	    NULL,
 	},
 	{
-	    USB_VENDOR_CHICONY2, 0,
+	    USB_VENDOR_MICRODIA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Chicony",
 	    NULL,