From 97ae0fe84cdc7ff3c931ea3e21679fe117848bbb Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Sun, 22 Oct 2000 16:48:08 +0000
Subject: [PATCH] Moved prototypes of isa_alloc_resourcev() and
 isa_load_resourcev() to isa/isavar.h, and added needed includes.

---
 sys/dev/fe/if_fe_cbus.c     |  2 ++
 sys/i386/include/bus_pc98.h | 10 ----------
 sys/isa/isavar.h            | 13 +++++++++++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index 85119f22416..ea61b7615fa 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -49,6 +49,8 @@
 #include <dev/fe/if_fereg.h>
 #include <dev/fe/if_fevar.h>
 
+#include <isa/isavar.h>
+
 /*
  *	Cbus specific code.
  */
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 271356e4667..44355665f77 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -72,7 +72,6 @@
 #ifndef _I386_BUS_PC98_H_
 #define _I386_BUS_PC98_H_
 
-#include <sys/bus.h>
 #include <machine/cpufunc.h>
 
 /*
@@ -121,15 +120,6 @@ typedef	struct {
     size_t		bsh_ressz;
 }* bus_space_handle_t;
 
-/*
- * Allocate discontinuous resources for ISA bus.
- */
-struct resource *
-isa_alloc_resourcev(device_t child, int type, int *rid,
-		    bus_addr_t *res, bus_size_t count, u_int flags);
-int
-isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count);
-
 /*
  * Map a region of device bus space into CPU virtual address space.
  */
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 393f8a57fe4..3082b6c4261 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -171,6 +171,19 @@ extern void	isa_dma_release __P((int chan));
 extern int	isa_dmastatus __P((int chan));
 extern int	isa_dmastop __P((int chan));
 
+#ifdef PC98
+#include <machine/bus.h>
+
+/*
+ * Allocate discontinuous resources for ISA bus.
+ */
+struct resource *
+isa_alloc_resourcev(device_t child, int type, int *rid,
+		    bus_addr_t *res, bus_size_t count, u_int flags);
+int
+isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count);
+#endif
+
 #endif /* _KERNEL */
 
 #endif /* !_ISA_ISAVAR_H_ */