From owner-p4-projects@FreeBSD.ORG  Fri Feb  9 16:15:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1ECD016A403; Fri,  9 Feb 2007 16:15:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EDA7716A40D
	for <perforce@freebsd.org>; Fri,  9 Feb 2007 16:15:38 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FDEA13C4B5
	for <perforce@freebsd.org>; Fri,  9 Feb 2007 16:15:38 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l19GFcD9054806
	for <perforce@freebsd.org>; Fri, 9 Feb 2007 16:15:38 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19GFcAj054803
	for perforce@freebsd.org; Fri, 9 Feb 2007 16:15:38 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 9 Feb 2007 16:15:38 GMT
Message-Id: <200702091615.l19GFcAj054803@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114302 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2007 16:15:39 -0000

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

Change 114302 by jhb@jhb_zion on 2007/02/09 16:15:17

	IFC @114298.

Affected files ...

.. //depot/projects/smpng/sys/dev/usb/ubsa.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#100 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#4 branch

Differences ...

==== //depot/projects/smpng/sys/dev/usb/ubsa.c#17 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.21 2007/02/04 22:14:18 le Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.22 2007/02/09 15:59:28 le Exp $");
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -232,6 +232,8 @@
 	{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G },
 	/* Option GlobeTrotter 3G QUAD */
 	{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD },
+	/* Huawei Mobile */
+	{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
 	{ 0, 0 }
 };
 

==== //depot/projects/smpng/sys/dev/usb/usbdevs#100 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.286 2007/02/04 22:14:18 le Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.287 2007/02/09 15:59:28 le Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -513,6 +513,7 @@
 vendor TSUNAMI		0x1241	Tsunami
 vendor CREATIVE2	0x1292	Creative Labs
 vendor BELKIN2		0x1293	Belkin
+vendor HUAWEI		0x12d1	Huawei Technologies
 vendor AINCOMM		0x12fd	Aincomm
 vendor MOBILITY		0x1342	Mobility
 vendor LINKSYS4		0x13b1	Linksys
@@ -1084,6 +1085,9 @@
 /* HP products */
 product HP2 C500		0x6002	PhotoSmart C500
 
+/* HUAWEI products */
+product HUAWEI MOBILE		0x1001	Huawei Mobile
+
 /* IBM Corporation */
 product IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive