From owner-svn-src-all@freebsd.org  Sun Nov  6 19:51:02 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 8F24CC32F6B;
 Sun,  6 Nov 2016 19:51:02 +0000 (UTC)
 (envelope-from avos@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 5AFA8EA3;
 Sun,  6 Nov 2016 19:51:02 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA6Jp1Ba031642;
 Sun, 6 Nov 2016 19:51:01 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA6Jp1CJ031641;
 Sun, 6 Nov 2016 19:51:01 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201611061951.uA6Jp1CJ031641@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sun, 6 Nov 2016 19:51:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308387 - head/etc
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.23
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: Sun, 06 Nov 2016 19:51:02 -0000

Author: avos
Date: Sun Nov  6 19:51:01 2016
New Revision: 308387
URL: https://svnweb.freebsd.org/changeset/base/308387

Log:
  Fix device driver name if devd.conf + move it into appropriate place.
  
  Noticed by:	Idwer Vollering <vidwer@gmail.com>

Modified:
  head/etc/devd.conf

Modified: head/etc/devd.conf
==============================================================================
--- head/etc/devd.conf	Sun Nov  6 19:37:22 2016	(r308386)
+++ head/etc/devd.conf	Sun Nov  6 19:51:01 2016	(r308387)
@@ -23,8 +23,8 @@ options {
 		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm)\
 		[0-9]+";
 	set wifi-driver-regex
-		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\
-		upgt|ural|urtw|rtwn_usb|wi|wpi|wtap|zyd)[0-9]+";
+		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rtwn|rum|run|\
+		uath|upgt|ural|urtw|wi|wpi|wtap|zyd)[0-9]+";
 };
 
 # Note that the attach/detach with the highest value wins, so that one can