From owner-p4-projects@FreeBSD.ORG Tue Dec 23 14:52:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B22F1065674; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1ED3A106564A for ; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E1C38FC1A for ; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNEqshO087172 for ; Tue, 23 Dec 2008 14:52:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNEqshw087170 for perforce@freebsd.org; Tue, 23 Dec 2008 14:52:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 14:52:54 GMT Message-Id: <200812231452.mBNEqshw087170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 155171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2008 14:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=155171 Change 155171 by hselasky@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,