From owner-svn-src-all@FreeBSD.ORG  Thu Mar 15 15:43:16 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 38405106564A;
	Thu, 15 Mar 2012 15:43:16 +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 2384F8FC12;
	Thu, 15 Mar 2012 15:43:16 +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 q2FFhFEk072318;
	Thu, 15 Mar 2012 15:43:15 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2FFhFEA072316;
	Thu, 15 Mar 2012 15:43:15 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201203151543.q2FFhFEA072316@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Thu, 15 Mar 2012 15:43:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233006 - releng/8.3/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: Thu, 15 Mar 2012 15:43:16 -0000

Author: ken
Date: Thu Mar 15 15:43:15 2012
New Revision: 233006
URL: http://svn.freebsd.org/changeset/base/233006

Log:
  Merge r232675 from head, via r232989 in stable/8:
  
    Make the mps(4) module depend on the cam module.
  
    Submitted by:	Mykola Dzham <i@levsha.me>
  
  Approved by:	re (kib)

Modified:
  releng/8.3/sys/dev/mps/mps_pci.c
Directory Properties:
  releng/8.3/sys/   (props changed)

Modified: releng/8.3/sys/dev/mps/mps_pci.c
==============================================================================
--- releng/8.3/sys/dev/mps/mps_pci.c	Thu Mar 15 14:22:05 2012	(r233005)
+++ releng/8.3/sys/dev/mps/mps_pci.c	Thu Mar 15 15:43:15 2012	(r233006)
@@ -87,6 +87,7 @@ static driver_t mps_pci_driver = {
 
 static devclass_t	mps_devclass;
 DRIVER_MODULE(mps, pci, mps_pci_driver, mps_devclass, 0, 0);
+MODULE_DEPEND(mps, cam, 1, 1, 1);
 
 struct mps_ident {
 	uint16_t	vendor;