From owner-svn-src-all@freebsd.org  Mon May  9 13:12:14 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E84BB3345A;
 Mon,  9 May 2016 13:12:14 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D94C912A7;
 Mon,  9 May 2016 13:12:13 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u49DCD6J074606;
 Mon, 9 May 2016 13:12:13 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u49DCDE3074605;
 Mon, 9 May 2016 13:12:13 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201605091312.u49DCDE3074605@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 9 May 2016 13:12:13 +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: r299260 - stable/10/etc/devd
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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2016 13:12:14 -0000

Author: hselasky
Date: Mon May  9 13:12:12 2016
New Revision: 299260
URL: https://svnweb.freebsd.org/changeset/base/299260

Log:
  MFC r298783:
  Regenerate usb.conf .

Modified:
  stable/10/etc/devd/usb.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/devd/usb.conf
==============================================================================
--- stable/10/etc/devd/usb.conf	Mon May  9 13:11:00 2016	(r299259)
+++ stable/10/etc/devd/usb.conf	Mon May  9 13:12:12 2016	(r299260)
@@ -1721,7 +1721,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
-	match "product" "(0x8178|0x8188|0x8189)";
+	match "product" "(0x8178|0x8179|0x8188|0x8189)";
 	action "kldload -n if_urtwn";
 };
 
@@ -3161,7 +3161,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
-	match "product" "(0x0052|0x005c|0x0061)";
+	match "product" "0x0052";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0df6";
+	match "product" "0x0056";
+	action "kldload -n if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0df6";
+	match "product" "(0x005c|0x0061)";
 	action "kldload -n if_urtwn";
 };
 
@@ -4633,7 +4649,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x17e9";
-	match "product" "(0x0059|0x0100|0x0117|0x0136|0x0138|0x0141|0x015a|0x0198|0x019b|0x01ba|0x01bb|0x01d4|0x01d7|0x01e2|0x0215|0x024c|0x02a9|0x0377|0x03e0|0x401a)";
+	match "product" "(0x0059|0x0100|0x0117|0x0136|0x0138|0x0141|0x015a|0x0198|0x019b|0x01ba|0x01bb|0x01d4|0x01d7|0x01e2|0x0215|0x024c|0x02a9|0x02e9|0x0377|0x03e0|0x401a)";
 	action "kldload -n udl";
 };
 
@@ -5801,5 +5817,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2719 USB entries processed
+# 2722 USB entries processed