diff options
-rw-r--r-- | sys/dev/fe/if_fe_cbus.c | 2 | ||||
-rw-r--r-- | sys/i386/include/bus_pc98.h | 10 | ||||
-rw-r--r-- | 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 85119f2..ea61b76 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 271356e..4435566 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> /* @@ -122,15 +121,6 @@ typedef struct { }* 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 393f8a5..3082b6c 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_ */ |