From owner-svn-src-all@FreeBSD.ORG  Sat Oct 11 10:47:21 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 653CB1065689;
	Sat, 11 Oct 2008 10:47:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54D668FC17;
	Sat, 11 Oct 2008 10:47:19 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9BAlJGN016405;
	Sat, 11 Oct 2008 10:47:19 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9BAlJ8Q016403;
	Sat, 11 Oct 2008 10:47:19 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200810111047.m9BAlJ8Q016403@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 11 Oct 2008 10:47:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183761 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2008 10:47:21 -0000

Author: rpaulo
Date: Sat Oct 11 10:47:18 2008
New Revision: 183761
URL: http://svn.freebsd.org/changeset/base/183761

Log:
  Move Qualcomm ZTE CDMA from ubsa(4) to u3g(4).
  
  Reviewed by:	n_hibma

Modified:
  head/sys/dev/usb/u3g.c
  head/sys/dev/usb/ubsa.c

Modified: head/sys/dev/usb/u3g.c
==============================================================================
--- head/sys/dev/usb/u3g.c	Sat Oct 11 02:01:51 2008	(r183760)
+++ head/sys/dev/usb/u3g.c	Sat Oct 11 10:47:18 2008	(r183761)
@@ -89,6 +89,8 @@ static const struct usb_devno u3g_devs[]
 	/* OEM: Huawei */
 	{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
 	{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },
+	/* OEM: Qualcomm */
+	{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },
 
 	{ 0, 0 }
 };

Modified: head/sys/dev/usb/ubsa.c
==============================================================================
--- head/sys/dev/usb/ubsa.c	Sat Oct 11 02:01:51 2008	(r183760)
+++ head/sys/dev/usb/ubsa.c	Sat Oct 11 10:47:18 2008	(r183761)
@@ -228,8 +228,6 @@ static const struct ubsa_product {
 	{ USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 },
 	/* Merlin */
 	{ USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620 },
-	/* Qualcomm, Inc. ZTE CDMA */
-	{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },
 	/* Novatel */
 	{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM },
 	/* Novatel Wireless Merlin ES620 */