summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSteve Murphree <smurph@cvs.openbsd.org>2001-07-06 00:23:10 +0000
committerSteve Murphree <smurph@cvs.openbsd.org>2001-07-06 00:23:10 +0000
commit3933f821cb3478c48812f1ec6e063abb420209df (patch)
treeeb58820bbbf3d77056bdcff1ba6d526565e63f8e /sys
parentb25f51ce5eb019f02d4d54961060b9f3678b5a95 (diff)
__powerpc__ is defined in gcc's specs and used throughout the tree for powerpc related stuff, so mvmeppc must retain __powerpc__ and add __mvmeppc__.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/isa/isavar.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index cfb26f2ce03..d3adcd646eb 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isavar.h,v 1.41 2001/07/06 00:04:29 smurph Exp $ */
+/* $OpenBSD: isavar.h,v 1.42 2001/07/06 00:23:09 smurph Exp $ */
/* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */
/*-
@@ -122,7 +122,7 @@
*/
struct isabus_attach_args;
-#if (__alpha__ + amiga + __i386__ + arc + __wgrisc__ + __powerpc__ + __mvmeppc__ + __hppa__ != 1)
+#if (__alpha__ + amiga + __i386__ + arc + __wgrisc__ + __powerpc__ + __hppa__ != 1)
#error "COMPILING ISA FOR UNSUPPORTED MACHINE, OR MORE THAN ONE."
#endif
#ifdef __alpha__
@@ -141,10 +141,11 @@ struct isabus_attach_args;
#include <wgrisc/isa/isa_machdep.h>
#endif
#ifdef __powerpc__
-#include <powerpc/isa/isa_machdep.h>
-#endif
#ifdef __mvmeppc__
#include <mvmeppc/isa/isa_machdep.h>
+#else
+#include <powerpc/isa/isa_machdep.h>
+#endif
#endif
#ifdef __hppa__
#include <hppa/isa/isa_machdep.h>