From owner-svn-src-head@FreeBSD.ORG  Tue May  3 18:23:12 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45E141065670;
	Tue,  3 May 2011 18:23:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3560A8FC15;
	Tue,  3 May 2011 18:23:12 +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 p43INCON005566;
	Tue, 3 May 2011 18:23:12 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p43INCON005563;
	Tue, 3 May 2011 18:23:12 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201105031823.p43INCON005563@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 3 May 2011 18:23:12 +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: r221394 - in head/sys: amd64/conf i386/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2011 18:23:12 -0000

Author: jhb
Date: Tue May  3 18:23:11 2011
New Revision: 221394
URL: http://svn.freebsd.org/changeset/base/221394

Log:
  Enable the new PCI-PCI bridge driver on amd64 and i386 by default.  It can
  be disabled via 'nooptions NEW_PCIB'.

Modified:
  head/sys/amd64/conf/DEFAULTS
  head/sys/i386/conf/DEFAULTS

Modified: head/sys/amd64/conf/DEFAULTS
==============================================================================
--- head/sys/amd64/conf/DEFAULTS	Tue May  3 17:37:24 2011	(r221393)
+++ head/sys/amd64/conf/DEFAULTS	Tue May  3 18:23:11 2011	(r221394)
@@ -20,3 +20,5 @@ options 	GEOM_PART_BSD
 options 	GEOM_PART_EBR
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
+
+options 	NEW_PCIB

Modified: head/sys/i386/conf/DEFAULTS
==============================================================================
--- head/sys/i386/conf/DEFAULTS	Tue May  3 17:37:24 2011	(r221393)
+++ head/sys/i386/conf/DEFAULTS	Tue May  3 18:23:11 2011	(r221394)
@@ -28,3 +28,5 @@ options 	GEOM_PART_MBR
 # enable support for native hardware
 options 	NATIVE
 device		atpic
+
+options 	NEW_PCIB