From owner-svn-src-all@FreeBSD.ORG  Mon Aug 17 13:51:20 2009
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 32858106568C;
	Mon, 17 Aug 2009 13:51:20 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 212DE8FC3F;
	Mon, 17 Aug 2009 13:51:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HDpK4K079518;
	Mon, 17 Aug 2009 13:51:20 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HDpKk4079515;
	Mon, 17 Aug 2009 13:51:20 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <200908171351.n7HDpKk4079515@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Mon, 17 Aug 2009 13:51:19 +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: r196321 - in stable/8: etc etc/mtree include
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: Mon, 17 Aug 2009 13:51:20 -0000

Author: scottl
Date: Mon Aug 17 13:51:19 2009
New Revision: 196321
URL: http://svn.freebsd.org/changeset/base/196321

Log:
  Merge files missed in r196285.  SVN is simply horrible.  Sorry for the
  tree breakage.
  
  Approved by:	re

Modified:
  stable/8/etc/   (props changed)
  stable/8/etc/mtree/BSD.include.dist
  stable/8/include/   (props changed)
  stable/8/include/Makefile

Modified: stable/8/etc/mtree/BSD.include.dist
==============================================================================
--- stable/8/etc/mtree/BSD.include.dist	Mon Aug 17 13:51:03 2009	(r196320)
+++ stable/8/etc/mtree/BSD.include.dist	Mon Aug 17 13:51:19 2009	(r196321)
@@ -104,6 +104,8 @@
         ..
         lmc
         ..
+	mfi
+	..
         mpt
             mpilib
             ..

Modified: stable/8/include/Makefile
==============================================================================
--- stable/8/include/Makefile	Mon Aug 17 13:51:03 2009	(r196320)
+++ stable/8/include/Makefile	Mon Aug 17 13:51:19 2009	(r196321)
@@ -40,7 +40,7 @@ LDIRS=	bsm cam geom net net80211 netatal
 
 LSUBDIRS=	cam/ata cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
-	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
+	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/mfi dev/ofw \
 	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \