From owner-svn-src-all@FreeBSD.ORG  Sat Jan 11 07:53:03 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E21E0CC6;
 Sat, 11 Jan 2014 07:53:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CDA461AD9;
 Sat, 11 Jan 2014 07:53:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0B7r3PM037909;
 Sat, 11 Jan 2014 07:53:03 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0B7r3hD037907;
 Sat, 11 Jan 2014 07:53:03 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201401110753.s0B7r3hD037907@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 11 Jan 2014 07:53:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260534 - in head/sys/dev/usb: net serial
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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 Jan 2014 07:53:04 -0000

Author: hselasky
Date: Sat Jan 11 07:53:03 2014
New Revision: 260534
URL: http://svnweb.freebsd.org/changeset/base/260534

Log:
  Move USB ID from u3g driver to uhso driver.
  
  Submitted by:	Lundberg, Johannes <johannes@brilliantservice.co.jp>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/net/uhso.c
  head/sys/dev/usb/serial/u3g.c

Modified: head/sys/dev/usb/net/uhso.c
==============================================================================
--- head/sys/dev/usb/net/uhso.c	Sat Jan 11 06:35:29 2014	(r260533)
+++ head/sys/dev/usb/net/uhso.c	Sat Jan 11 07:53:03 2014	(r260534)
@@ -269,6 +269,8 @@ static const STRUCT_USB_HOST_ID uhso_dev
 	UHSO_DEV(OPTION, ICON401, UHSO_AUTO_IFACE),
 	/* Option GlobeTrotter Module 382 */
 	UHSO_DEV(OPTION, GMT382, UHSO_AUTO_IFACE),
+	/* Option GTM661W */
+	UHSO_DEV(OPTION, GTM661W, UHSO_AUTO_IFACE),
 	/* Option iCON EDGE */
 	UHSO_DEV(OPTION, ICONEDGE, UHSO_STATIC_IFACE),
 	/* Option Module HSxPA */

Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c	Sat Jan 11 06:35:29 2014	(r260533)
+++ head/sys/dev/usb/serial/u3g.c	Sat Jan 11 07:53:03 2014	(r260534)
@@ -388,7 +388,6 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(OPTION, GTMAXHSUPA, 0),
 	U3G_DEV(OPTION, GTMAXHSUPAE, 0),
 	U3G_DEV(OPTION, VODAFONEMC3G, 0),
-	U3G_DEV(OPTION, GTM661W, 0),
 	U3G_DEV(QISDA, H20_1, 0),
 	U3G_DEV(QISDA, H20_2, 0),
 	U3G_DEV(QISDA, H21_1, 0),