From owner-svn-src-head@FreeBSD.ORG  Mon Jun 27 20:32:19 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A203A106566B;
	Mon, 27 Jun 2011 20:32:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 927288FC16;
	Mon, 27 Jun 2011 20:32:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5RKWJ2s012549;
	Mon, 27 Jun 2011 20:32:19 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5RKWJkx012547;
	Mon, 27 Jun 2011 20:32:19 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201106272032.p5RKWJkx012547@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 27 Jun 2011 20:32: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: r223604 - head/etc/devd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2011 20:32:19 -0000

Author: hselasky
Date: Mon Jun 27 20:32:19 2011
New Revision: 223604
URL: http://svn.freebsd.org/changeset/base/223604

Log:
  Regenerate usb.conf after r223566.

Modified:
  head/etc/devd/usb.conf

Modified: head/etc/devd/usb.conf
==============================================================================
--- head/etc/devd/usb.conf	Mon Jun 27 20:04:13 2011	(r223603)
+++ head/etc/devd/usb.conf	Mon Jun 27 20:32:19 2011	(r223604)
@@ -1533,15 +1533,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
-	match "product" "0x4506";
-	action "kldload if_uath";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x083a";
-	match "product" "0x4506";
+	match "product" "(0x4505|0x4506)";
 	action "kldload if_zyd";
 };