summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authorgarbled <garbled@NetBSD.org>2007-04-11 18:32:19 +0000
committergarbled <garbled@NetBSD.org>2007-04-11 18:32:19 +0000
commitd3f6afef69293d068cff033a463d5c0cf83a3700 (patch)
tree5c4c4d8cf1f732471053c7518985c56c9293d94a /sys/dev/mca
parent29fbd02006c7e2574061f7b47083637f5209307f (diff)
Remove the define of MCA_MAX_SLOTS from mcareg.h, and include
mca_machdep.h, because the maximum number of slots is inherently MD.
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/mca.c5
-rw-r--r--sys/dev/mca/mcareg.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index d31bb99afd6..7160f041e16 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,13 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/bus.h>
+#include <machine/mca_machdep.h>
#include <dev/mca/mcareg.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/mcareg.h b/sys/dev/mca/mcareg.h
index ec6984026dc..cb3d51926f7 100644
--- a/sys/dev/mca/mcareg.h
+++ b/sys/dev/mca/mcareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcareg.h,v 1.1 2000/05/11 15:42:06 jdolecek Exp $ */
+/* $NetBSD: mcareg.h,v 1.2 2007/04/11 18:32:19 garbled Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,8 +44,6 @@
* Standardized MCA configuration information
*/
-#define MCA_MAX_SLOTS 8 /* max number of slots per bus */
-
/* POS register bits */
#define MCA_POS2_ENABLE 0x01 /* POS2, hi => adapter enabled */