From 11a91bffe528ee9ac968079a0fa615ea7aeec111 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 2 Sep 2003 20:24:42 +0000
Subject: [PATCH] Preparatory commit to allow prototypes in ofw_machdep.h to
 contain both newbus types and OFW types. This involves either including
 <machine/bus.h> or <dev/ofw/openfirm.h>.

Reviewed by: jake, jmg, tmm
---
 sys/dev/gem/if_gem_pci.c         | 1 +
 sys/dev/hme/if_hme_pci.c         | 1 +
 sys/dev/hme/if_hme_sbus.c        | 1 +
 sys/sparc64/sparc64/machdep.c    | 1 +
 sys/sparc64/sparc64/mp_machdep.c | 1 +
 sys/sparc64/sparc64/vm_machdep.c | 1 +
 6 files changed, 6 insertions(+)

diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 0383f0e4f5c0..ecd1b10179b7 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <dev/ofw/openfirm.h>
 #include <machine/ofw_machdep.h>
 
 #include <sys/rman.h>
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index 4e8630fd73a1..1d205ff2e353 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/bus.h>
+#include <dev/ofw/openfirm.h>
 #include <machine/ofw_machdep.h>
 #include <machine/resource.h>
 
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 7fa16409027b..503eb67f3308 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/bus.h>
+#include <dev/ofw/openfirm.h>
 #include <machine/ofw_machdep.h>
 #include <machine/resource.h>
 
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 505ba38ee4ae..c0349f951486 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -89,6 +89,7 @@
 
 #include <ddb/ddb.h>
 
+#include <machine/bus.h>
 #include <machine/cache.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
diff --git a/sys/sparc64/sparc64/mp_machdep.c b/sys/sparc64/sparc64/mp_machdep.c
index 7385a86396e7..967ac5a69eed 100644
--- a/sys/sparc64/sparc64/mp_machdep.c
+++ b/sys/sparc64/sparc64/mp_machdep.c
@@ -80,6 +80,7 @@
 
 #include <machine/asi.h>
 #include <machine/atomic.h>
+#include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/ofw_machdep.h>
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index 2672be0ceda0..9d4689bfa14d 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -76,6 +76,7 @@
 #include <vm/uma_int.h>
 
 #include <machine/cache.h>
+#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/fp.h>
 #include <machine/fsr.h>