diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 11:52:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 11:52:38 +0000 |
| commit | f08858fde116b0751e7900a818b1e0df04af2a80 (patch) | |
| tree | b50dfb9f4506b32870dcd9f8f688659afcc5c1fe | |
| parent | 764ac08b5b4f4c5547af95d98b8f40627150dc0d (diff) | |
move hp300 to -D__hp300__; ok miod
| -rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 4 | ||||
| -rw-r--r-- | sys/dev/isa/isavar.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 01a90bf14be..adf389b1c58 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.59 2010/04/28 15:31:33 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.60 2010/05/23 11:52:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach} _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch -CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dmc68020 +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -Dmc68020 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main \ -Wstack-larger-than-2047 -Wvariable-decl diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index 94cdd0c1a84..59fd5cbb27b 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isavar.h,v 1.53 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: isavar.h,v 1.54 2010/05/23 11:52:37 deraadt Exp $ */ /* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */ /*- @@ -117,9 +117,7 @@ struct isabus_attach_args; #if defined(__alpha__) #include <alpha/isa/isa_machdep.h> -#elif defined(__cats__) -#include <cats/isa/isa_machdep.h> -#elif defined(hp300) +#elif defined(__hp300__) #include <hp300/dev/isa_machdep.h> #elif defined(__i386__) #include <i386/isa/isa_machdep.h> |