More include files cleaning:

- move MAX_CPUS constant to <machine/cpu.h>
- do not include <machine/board.h> unless needed. In fact, remove this file
  entirely on mvme88k, and include <machine/mvme*.h> on a
  compiling-for-this-board basis
- keep MAX_CMMUS constant private to the m8820x code

1 files changed, 8 insertions, 2 deletions

diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index b13ed5a0060..a394254f76d 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.12 2004/05/07 18:10:28 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.13 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -34,10 +34,16 @@
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 
+#ifdef MVME188
+#include <machine/mvme188.h>
+#endif
+#if defined(MVME187) || defined(MVME197)
+#include <machine/mvme1x7.h>
+#endif
+
 void	mainbus_attach(struct device *, struct device *, void *);
 int 	mainbus_match(struct device *, void *, void *);
 int	mainbus_print(void *, const char *);