From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 05:19:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 771F11065688; Sat,  8 Nov 2008 05:19:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39EE61065692
	for <perforce@freebsd.org>; Sat,  8 Nov 2008 05:19:47 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 28C1D8FC35
	for <perforce@freebsd.org>; Sat,  8 Nov 2008 05:19:47 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA85JlXr015951
	for <perforce@freebsd.org>; Sat, 8 Nov 2008 05:19:47 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA85JlA2015949
	for perforce@freebsd.org; Sat, 8 Nov 2008 05:19:47 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Sat, 8 Nov 2008 05:19:47 GMT
Message-Id: <200811080519.mA85JlA2015949@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152641 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2008 05:19:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=152641

Change 152641 by nwhitehorn@nwhitehorn_trantor on 2008/11/08 05:18:47

	Allow kernel to be built without device isa.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#7 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#7 (text+ko) ====

@@ -37,7 +37,6 @@
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <isa/isavar.h>
 
 #include <machine/bus.h>
 #include <machine/md_var.h>
@@ -56,6 +55,12 @@
 
 #include "pcib_if.h"
 
+#include "opt_isa.h"
+
+#ifdef DEV_ISA
+#include <isa/isavar.h>
+#endif
+
 static MALLOC_DEFINE(M_CPCHT, "cpcht", "CPC HT device information");
 
 /*
@@ -166,6 +171,8 @@
 	return (device_get_ivars(child));	
 }
 
+#ifdef DEV_ISA
+
 /*
  * CPC ISA Device interface.
  */
@@ -217,6 +224,8 @@
 	return (0);
 }
 
+#endif /* DEV_ISA */
+
 /*
  * CPC PCI Device interface.
  */