From owner-svn-src-all@FreeBSD.ORG  Fri Jan 24 08:22:30 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 0F6413F7;
 Fri, 24 Jan 2014 08:22:30 +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 EE33F11FB;
 Fri, 24 Jan 2014 08:22:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0O8MTQZ026871;
 Fri, 24 Jan 2014 08:22:29 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0O8MTvp026870;
 Fri, 24 Jan 2014 08:22:29 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201401240822.s0O8MTvp026870@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 24 Jan 2014 08:22:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261115 - stable/10/sys/dev/usb/net
X-SVN-Group: stable-10
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: Fri, 24 Jan 2014 08:22:30 -0000

Author: hselasky
Date: Fri Jan 24 08:22:29 2014
New Revision: 261115
URL: http://svnweb.freebsd.org/changeset/base/261115

Log:
  MFC r260534:
  Move USB ID from u3g driver to uhso driver.

Modified:
  stable/10/sys/dev/usb/net/uhso.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/net/uhso.c
==============================================================================
--- stable/10/sys/dev/usb/net/uhso.c	Fri Jan 24 08:19:50 2014	(r261114)
+++ stable/10/sys/dev/usb/net/uhso.c	Fri Jan 24 08:22:29 2014	(r261115)
@@ -268,6 +268,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 */