diff options
| -rw-r--r-- | sys/arch/hppa/include/eisa_machdep.h (renamed from sys/arch/hppa/eisa/eisa_machdep.h) | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/include/isa_machdep.h (renamed from sys/arch/hppa/isa/isa_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/dev/eisa/eisavar.h | 4 | ||||
| -rw-r--r-- | sys/dev/isa/isavar.h | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/hppa/eisa/eisa_machdep.h b/sys/arch/hppa/include/eisa_machdep.h index 732812c416b..3cf39603577 100644 --- a/sys/arch/hppa/eisa/eisa_machdep.h +++ b/sys/arch/hppa/include/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 03:15:53 millert Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.1 2002/12/20 01:56:32 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -30,6 +30,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _EISA_MACHDEP_H_ +#define _EISA_MACHDEP_H_ + /* * Types provided to machine-independent EISA code. */ @@ -69,3 +72,4 @@ struct hppa_eisa_chipset { #define eisa_intr_disestablish(c, h) \ (*(c)->ec_intr_disestablish)((c)->ec_v, (h)) +#endif /* _EISA_MACHDEP_H_ */ diff --git a/sys/arch/hppa/isa/isa_machdep.h b/sys/arch/hppa/include/isa_machdep.h index 5be71734498..7df071e5675 100644 --- a/sys/arch/hppa/isa/isa_machdep.h +++ b/sys/arch/hppa/include/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.4 2002/03/14 03:15:53 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.1 2002/12/20 01:56:32 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff diff --git a/sys/dev/eisa/eisavar.h b/sys/dev/eisa/eisavar.h index 9451b2c30be..17a8c6f4bf3 100644 --- a/sys/dev/eisa/eisavar.h +++ b/sys/dev/eisa/eisavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisavar.h,v 1.10 1999/06/16 14:38:35 espie Exp $ */ +/* $OpenBSD: eisavar.h,v 1.11 2002/12/20 01:56:32 mickey Exp $ */ /* $NetBSD: eisavar.h,v 1.11 1997/06/06 23:30:07 thorpej Exp $ */ /* @@ -67,7 +67,7 @@ ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE. #include <arc/eisa/eisa_machdep.h> #endif #if __hppa__ -#include <hppa/eisa/eisa_machdep.h> +#include <hppa/include/eisa_machdep.h> #endif typedef int eisa_slot_t; /* really only needs to be 4 bits */ diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index 83185aa53c5..5b4b0dbd997 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isavar.h,v 1.44 2002/06/30 16:05:59 miod Exp $ */ +/* $OpenBSD: isavar.h,v 1.45 2002/12/20 01:56:32 mickey Exp $ */ /* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */ /*- @@ -148,7 +148,7 @@ struct isabus_attach_args; #endif #endif #ifdef __hppa__ -#include <hppa/isa/isa_machdep.h> +#include <hppa/include/isa_machdep.h> #endif #include "isapnp.h" |