From owner-svn-src-all@FreeBSD.ORG  Sat Feb 11 00:28:31 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0ACBE106566C;
	Sat, 11 Feb 2012 00:28:31 +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 EE3B98FC08;
	Sat, 11 Feb 2012 00:28:30 +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 q1B0SURK004250;
	Sat, 11 Feb 2012 00:28:30 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1B0SUKD004248;
	Sat, 11 Feb 2012 00:28:30 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201202110028.q1B0SUKD004248@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Sat, 11 Feb 2012 00:28:30 +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: r231485 - head/sys/dev/mps
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2012 00:28:31 -0000

Author: ken
Date: Sat Feb 11 00:28:30 2012
New Revision: 231485
URL: http://svn.freebsd.org/changeset/base/231485

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/sys/dev/mps/mps_pci.c

Modified: head/sys/dev/mps/mps_pci.c
==============================================================================
--- head/sys/dev/mps/mps_pci.c	Sat Feb 11 00:19:31 2012	(r231484)
+++ head/sys/dev/mps/mps_pci.c	Sat Feb 11 00:28:30 2012	(r231485)
@@ -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);
 }