2 files changed, 10 insertions, 8 deletions

diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 657b9b3be9ce..4c0900569a49 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,8 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: eisaconf.c,v 1.26 1997/02/22 09:32:02 peter Exp $
  */
+
+#include "opt_eisa.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -96,7 +99,10 @@ static struct {
 #define	MAX_COL 80
 } reg_state;
 
-/* XXX Global variable, so UserConfig can change it. */
+/* Global variable, so UserConfig can change it. */
+#ifndef EISA_SLOTS
+#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
+#endif
 int num_eisa_slots = EISA_SLOTS;
 		
 /*
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index a9921136a58a..38cfa94c3db8 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $
+ *	$Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -36,11 +36,6 @@
 
 #include <sys/queue.h>
 
-#include "opt_eisa.h"
-
-#ifndef EISA_SLOTS
-#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
-#endif
 #define EISA_SLOT_SIZE 0x1000
 
 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@')  /* Bits 26-30 */
@@ -51,6 +46,7 @@
 #define EISA_REVISION_ID(ID) (u_char)(ID & 0x0F)              /* Bits  0-3  */
 
 extern struct linker_set eisadriver_set;
+extern int num_eisa_slots;
 
 typedef u_int32_t eisa_id_t;