PERFORCE change 152641 for review

[Nathan Whitehorn]

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

Change 152641 by nwhitehorn at 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.
  */