From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jan 13 21:03:06 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 749E1106566B;
	Wed, 13 Jan 2010 21:03:06 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 633FE8FC0C;
	Wed, 13 Jan 2010 21:03:06 +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 o0DL36Vo023479;
	Wed, 13 Jan 2010 21:03:06 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0DL36gu023476;
	Wed, 13 Jan 2010 21:03:06 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201001132103.o0DL36gu023476@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 13 Jan 2010 21:03:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202247 - in stable/7/sys: conf sun4v/conf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 21:03:06 -0000

Author: marius
Date: Wed Jan 13 21:03:06 2010
New Revision: 202247
URL: http://svn.freebsd.org/changeset/base/202247

Log:
  MFC: r200917
  
  Hook ebus(4) and isa(4) up to the sun4v LINT build in order to
  ensure that their compilation doesn't break as they are expected
  to work as-is now (but aren't actually run-time tested).

Modified:
  stable/7/sys/conf/files.sun4v
  stable/7/sys/sun4v/conf/NOTES
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/conf/files.sun4v
==============================================================================
--- stable/7/sys/conf/files.sun4v	Wed Jan 13 21:03:04 2010	(r202246)
+++ stable/7/sys/conf/files.sun4v	Wed Jan 13 21:03:06 2010	(r202247)
@@ -32,6 +32,10 @@ libkern/ffs.c			standard
 libkern/ffsl.c			standard
 libkern/fls.c			standard
 libkern/flsl.c			standard
+sparc64/ebus/ebus.c		optional	ebus
+sparc64/isa/isa.c		optional	isa
+sparc64/isa/isa_dma.c		optional	isa
+sparc64/isa/ofw_isa.c		optional	ebus | isa
 sparc64/sparc64/autoconf.c	standard
 sun4v/sun4v/bus_machdep.c	standard
 sun4v/sun4v/clock.c		standard

Modified: stable/7/sys/sun4v/conf/NOTES
==============================================================================
--- stable/7/sys/sun4v/conf/NOTES	Wed Jan 13 21:03:04 2010	(r202246)
+++ stable/7/sys/sun4v/conf/NOTES	Wed Jan 13 21:03:06 2010	(r202247)
@@ -19,7 +19,7 @@ cpu		SUN4V
 # HARDWARE BUS CONFIGURATION
 
 device		ebus
-#device		isa
+device		isa
 device		pci