From owner-svn-src-stable@FreeBSD.ORG  Tue Feb 14 16:47:52 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 D0CEB1065674;
	Tue, 14 Feb 2012 16:47:52 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF1458FC1A;
	Tue, 14 Feb 2012 16:47:52 +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 q1EGlqRe008368;
	Tue, 14 Feb 2012 16:47:52 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EGlqt0008366;
	Tue, 14 Feb 2012 16:47:52 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201202141647.q1EGlqt0008366@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Tue, 14 Feb 2012 16:47:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231691 - stable/8/sys/dev/mps
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, 14 Feb 2012 16:47:52 -0000

Author: ken
Date: Tue Feb 14 16:47:52 2012
New Revision: 231691
URL: http://svn.freebsd.org/changeset/base/231691

Log:
  MFC 231485
  
  Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR from the mps driver
  probe routine.
  
  This will allow LSI to ship drivers that return BUS_PROBE_VENDOR to
  override the in-tree version of the driver.

Modified:
  stable/8/sys/dev/mps/mps_pci.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/mps/mps_pci.c
==============================================================================
--- stable/8/sys/dev/mps/mps_pci.c	Tue Feb 14 16:46:59 2012	(r231690)
+++ stable/8/sys/dev/mps/mps_pci.c	Tue Feb 14 16:47:52 2012	(r231691)
@@ -172,7 +172,7 @@ mps_pci_probe(device_t dev)
 
 	if ((id = mps_find_ident(dev)) != NULL) {
 		device_set_desc(dev, id->desc);
-		return (BUS_PROBE_VENDOR);
+		return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }