PERFORCE change 147159 for review

[Hans Petter Selasky]

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

Change 147159 by hselasky at hselasky_laptop001 on 2008/08/11 16:23:26

	
	Fix some products in "usbdevs" which breaks compilation.

Affected files ...

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

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#4 (text+ko) ====

@@ -793,7 +793,7 @@
 
 /* AIPTEK products */
 product AIPTEK POCKETCAM3M	0x2011	PocketCAM 3Mega
-product AIPTEK2 PENCAM_MEGA_1_3 0x504a	PenCam Mega 1.3
+product SUNPLUS PENCAM_MEGA_1_3 0x504a	PenCam Mega 1.3
 
 /* AirPrime products */
 product AIRPRIME PC5220		0x0112	CDMA Wireless PC Card
@@ -1002,7 +1002,7 @@
 
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
-product CHICONY2 TWINKLECAM	0x600d	TwinkleCam USB camera
+product MICRODIA TWINKLECAM	0x600d	TwinkleCam USB camera
 
 /* CH Products */
 product CHPRODUCTS PROTHROTTLE	0x00f1	Pro Throttle

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

@@ -800,7 +800,7 @@
 
 /* AIPTEK products */
 #define	USB_PRODUCT_AIPTEK_POCKETCAM3M	0x2011		/* PocketCAM 3Mega */
-#define	USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3	0x504a		/* PenCam Mega 1.3 */
+#define	USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3	0x504a		/* PenCam Mega 1.3 */
 
 /* AirPrime products */
 #define	USB_PRODUCT_AIRPRIME_PC5220	0x0112		/* CDMA Wireless PC Card */
@@ -1009,7 +1009,7 @@
 
 /* Chicony products */
 #define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
-#define	USB_PRODUCT_CHICONY2_TWINKLECAM	0x600d		/* TwinkleCam USB camera */
+#define	USB_PRODUCT_MICRODIA_TWINKLECAM	0x600d		/* TwinkleCam USB camera */
 
 /* CH Products */
 #define	USB_PRODUCT_CHPRODUCTS_PROTHROTTLE	0x00f1		/* Pro Throttle */

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

@@ -599,9 +599,9 @@
 	    "PocketCAM 3Mega",
 	},
 	{
-	    USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3,
+	    USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3,
 	    0,
-	    "",
+	    "Sunplus",
 	    "PenCam Mega 1.3",
 	},
 	{
@@ -1385,9 +1385,9 @@
 	    "KB-8933 keyboard",
 	},
 	{
-	    USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM,
+	    USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM,
 	    0,
-	    "",
+	    "Chicony",
 	    "TwinkleCam USB camera",
 	},
 	{