From owner-svn-src-stable@FreeBSD.ORG  Tue Mar 27 15:32:10 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 439841065674;
	Tue, 27 Mar 2012 15:32:10 +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 2DCC68FC18;
	Tue, 27 Mar 2012 15:32:10 +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 q2RFWAGA092419;
	Tue, 27 Mar 2012 15:32:10 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2RFW9qE092417;
	Tue, 27 Mar 2012 15:32:09 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201203271532.q2RFW9qE092417@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 27 Mar 2012 15:32:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233561 - stable/9/tools/tools/bus_autoconf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Mar 2012 15:32:10 -0000

Author: hselasky
Date: Tue Mar 27 15:32:09 2012
New Revision: 233561
URL: http://svn.freebsd.org/changeset/base/233561

Log:
  MFC r233110:
  Use new -n option when executing kldload, to
  not warn about already loaded module(s).

Modified:
  stable/9/tools/tools/bus_autoconf/bus_usb.c
Directory Properties:
  stable/9/tools/   (props changed)
  stable/9/tools/tools/   (props changed)

Modified: stable/9/tools/tools/bus_autoconf/bus_usb.c
==============================================================================
--- stable/9/tools/tools/bus_autoconf/bus_usb.c	Tue Mar 27 15:29:51 2012	(r233560)
+++ stable/9/tools/tools/bus_autoconf/bus_usb.c	Tue Mar 27 15:32:09 2012	(r233561)
@@ -317,7 +317,7 @@ usb_dump(struct usb_device_id *id, uint3
 		printf("	match \"intprotocol\" \"0x%02x\";\n",
 		    id->bInterfaceProtocol);
 	}
-	printf("	action \"kldload %s\";\n"
+	printf("	action \"kldload -n %s\";\n"
 	    "};\n\n", id->module_name);
 
 	return (n);