From f66efdaa0ee892ee683d1f77196728dd915db7c0 Mon Sep 17 00:00:00 2001
From: Per Fogelstrom <pefo@cvs.openbsd.org>
Date: Wed, 28 Jan 1998 13:46:39 +0000
Subject: Moving around files for new mips arch layout

---
 sys/arch/arc/isa/isabus.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sys/arch/arc/isa')

diff --git a/sys/arch/arc/isa/isabus.c b/sys/arch/arc/isa/isabus.c
index 1439c36d0c4..36c3fb38abc 100644
--- a/sys/arch/arc/isa/isabus.c
+++ b/sys/arch/arc/isa/isabus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isabus.c,v 1.11 1997/04/19 17:20:01 pefo Exp $	*/
+/*	$OpenBSD: isabus.c,v 1.12 1998/01/28 13:46:37 pefo Exp $	*/
 /*	$NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp $	*/
 
 /*-
@@ -102,7 +102,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
-#include <arc/arc/arctype.h>
+#include <mips/archtype.h>
 #include <arc/pica/pica.h>
 
 #include <dev/isa/isareg.h>
@@ -141,7 +141,7 @@ int	isabr_iointr __P((unsigned int, struct clockframe *));
 void	isabr_initicu __P((void));
 void	intr_calculatemasks __P((void));
 
-extern int cputype;
+extern int system_type;
 
 
 int
@@ -174,7 +174,7 @@ isabrattach(parent, self, aux)
 	isabr_initicu();
 
 	/* set up interrupt handlers */
-	switch(cputype) {
+	switch(system_type) {
 	case ACER_PICA_61:
 		set_intr(INT_MASK_2, isabr_iointr, 3);
 		break;
@@ -185,7 +185,7 @@ isabrattach(parent, self, aux)
 		set_intr(INT_MASK_2, isabr_iointr, 2);
 		break;
 	default:
-		panic("isabrattach: unkown cputype!");
+		panic("isabrattach: unkown system_type!");
 	}
 
 /*XXX we may remove the abus part of the softc struct... */
@@ -391,7 +391,7 @@ isabr_iointr(mask, cf)
 	int o_imen;
 	char vector;
 
-	switch(cputype) {
+	switch(system_type) {
 	case ACER_PICA_61:
 		isa_vector = in32(R4030_SYS_ISA_VECTOR) & (ICU_LEN - 1);
 		break;
-- 
cgit v1.2.3