Don't include <mips64/archtype.h> unless you really need it.

14 files changed, 14 insertions, 37 deletions

diff --git a/sys/arch/sgi/dev/com_ioc.c b/sys/arch/sgi/dev/com_ioc.c
index 066900d0c11..cb8adcc79e9 100644
--- a/sys/arch/sgi/dev/com_ioc.c
+++ b/sys/arch/sgi/dev/com_ioc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_ioc.c,v 1.8 2010/03/07 13:44:24 miod Exp $ */
+/*	$OpenBSD: com_ioc.c,v 1.9 2012/10/03 22:46:09 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -32,7 +32,6 @@
 #include <sys/tty.h>
 
 #include <machine/autoconf.h>
-#include <mips64/archtype.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff --git a/sys/arch/sgi/dev/gbe.c b/sys/arch/sgi/dev/gbe.c
index a89b1b262e9..b142fb545b2 100644
--- a/sys/arch/sgi/dev/gbe.c
+++ b/sys/arch/sgi/dev/gbe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gbe.c,v 1.16 2012/05/29 17:37:09 mikeb Exp $ */
+/*	$OpenBSD: gbe.c,v 1.17 2012/10/03 22:46:09 miod Exp $ */
 
 /*
  * Copyright (c) 2007, 2008, 2009 Joel Sing <jsing@openbsd.org>
@@ -31,7 +31,6 @@
 #include <machine/bus.h>
 
 #include <mips64/arcbios.h>
-#include <mips64/archtype.h>
 
 #include <sgi/dev/gl.h>
 #include <sgi/localbus/crimebus.h>
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c
index 368be93155e..e4cc431c796 100644
--- a/sys/arch/sgi/dev/if_mec.c
+++ b/sys/arch/sgi/dev/if_mec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mec.c,v 1.24 2012/05/22 19:24:59 miod Exp $ */
+/*	$OpenBSD: if_mec.c,v 1.25 2012/10/03 22:46:09 miod Exp $ */
 /*	$NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */
 
 /*
@@ -102,7 +102,6 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <mips64/archtype.h>
 #include <mips64/arcbios.h>
 #include <sgi/dev/if_mecreg.h>
 
diff --git a/sys/arch/sgi/dev/mavb.c b/sys/arch/sgi/dev/mavb.c
index b6fe1327577..bcbf54e6af2 100644
--- a/sys/arch/sgi/dev/mavb.c
+++ b/sys/arch/sgi/dev/mavb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mavb.c,v 1.13 2010/07/15 03:43:11 jakemsr Exp $	*/
+/*	$OpenBSD: mavb.c,v 1.14 2012/10/03 22:46:09 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -24,13 +24,10 @@
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/autoconf.h>
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 
-#include <mips64/archtype.h>
-
 #include <sgi/localbus/macebus.h>
 #include <sgi/localbus/macebusvar.h>
 #include <sgi/dev/mavbreg.h>
diff --git a/sys/arch/sgi/gio/impact_gio.c b/sys/arch/sgi/gio/impact_gio.c
index 72878f5fc59..dc050c08ab2 100644
--- a/sys/arch/sgi/gio/impact_gio.c
+++ b/sys/arch/sgi/gio/impact_gio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impact_gio.c,v 1.5 2012/05/12 16:49:00 miod Exp $	*/
+/*	$OpenBSD: impact_gio.c,v 1.6 2012/10/03 22:46:09 miod Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 
 #include <machine/autoconf.h>
-#include <mips64/archtype.h>
 
 #include <mips64/arcbios.h>
 
diff --git a/sys/arch/sgi/gio/light.c b/sys/arch/sgi/gio/light.c
index 23c7fac501e..a39516e8628 100644
--- a/sys/arch/sgi/gio/light.c
+++ b/sys/arch/sgi/gio/light.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: light.c,v 1.3 2012/05/10 21:29:28 miod Exp $	*/
+/*	$OpenBSD: light.c,v 1.4 2012/10/03 22:46:09 miod Exp $	*/
 /*	$NetBSD: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $	*/
 
 /*
@@ -64,7 +64,6 @@
 #include <sys/malloc.h>
 
 #include <machine/autoconf.h>
-#include <mips64/archtype.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/arch/sgi/gio/newport.c b/sys/arch/sgi/gio/newport.c
index b4f2b7e5503..eeb7e176779 100644
--- a/sys/arch/sgi/gio/newport.c
+++ b/sys/arch/sgi/gio/newport.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newport.c,v 1.4 2012/05/10 21:29:28 miod Exp $	*/
+/*	$OpenBSD: newport.c,v 1.5 2012/10/03 22:46:09 miod Exp $	*/
 /*	$NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $	*/
 
 /*
@@ -51,7 +51,6 @@
 #include <sys/malloc.h>
 
 #include <machine/autoconf.h>
-#include <mips64/archtype.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/arch/sgi/hpc/dpclock.c b/sys/arch/sgi/hpc/dpclock.c
index 600c3ede567..b14f78f3aef 100644
--- a/sys/arch/sgi/hpc/dpclock.c
+++ b/sys/arch/sgi/hpc/dpclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpclock.c,v 1.1 2012/03/28 20:44:23 miod Exp $	*/
+/*	$OpenBSD: dpclock.c,v 1.2 2012/10/03 22:46:09 miod Exp $	*/
 /*	$NetBSD: dpclock.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $	*/
 
 /*
@@ -92,10 +92,8 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/autoconf.h>
 #include <machine/bus.h>
 
-#include <mips64/archtype.h>
 #include <mips64/dev/clockvar.h>
 
 #include <dev/ic/dp8573areg.h>
diff --git a/sys/arch/sgi/hpc/dsclock.c b/sys/arch/sgi/hpc/dsclock.c
index 4831371da2d..d8979ccdc1a 100644
--- a/sys/arch/sgi/hpc/dsclock.c
+++ b/sys/arch/sgi/hpc/dsclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dsclock.c,v 1.3 2012/04/06 19:00:49 miod Exp $	*/
+/*	$OpenBSD: dsclock.c,v 1.4 2012/10/03 22:46:09 miod Exp $	*/
 /*	$NetBSD: dsclock.c,v 1.5 2011/07/01 18:53:46 dyoung Exp $	*/
 
 /*
@@ -40,10 +40,8 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/autoconf.h>
 #include <machine/bus.h>
 
-#include <mips64/archtype.h>
 #include <mips64/dev/clockvar.h>
 
 #include <dev/ic/ds1286reg.h>
diff --git a/sys/arch/sgi/hpc/pckbc_hpc.c b/sys/arch/sgi/hpc/pckbc_hpc.c
index e1b2bcd2751..0e67ef79390 100644
--- a/sys/arch/sgi/hpc/pckbc_hpc.c
+++ b/sys/arch/sgi/hpc/pckbc_hpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pckbc_hpc.c,v 1.1 2012/04/16 22:31:36 miod Exp $	*/
+/*	$OpenBSD: pckbc_hpc.c,v 1.2 2012/10/03 22:46:09 miod Exp $	*/
 /* $NetBSD: pckbc_hpc.c,v 1.9 2008/03/15 13:23:24 cube Exp $	 */
 
 /*
@@ -40,7 +40,6 @@
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
-#include <mips64/archtype.h>
 
 #include <sgi/hpc/hpcreg.h>
 #include <sgi/hpc/hpcvar.h>
diff --git a/sys/arch/sgi/hpc/wdsc.c b/sys/arch/sgi/hpc/wdsc.c
index 7db90b26182..b8e8409e565 100644
--- a/sys/arch/sgi/hpc/wdsc.c
+++ b/sys/arch/sgi/hpc/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.2 2012/04/15 20:40:39 miod Exp $	*/
+/*	$OpenBSD: wdsc.c,v 1.3 2012/10/03 22:46:09 miod Exp $	*/
 /*	$NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $	*/
 
 /*
@@ -47,9 +47,6 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
-#include <mips64/archtype.h>
-
-#include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
diff --git a/sys/arch/sgi/localbus/com_lbus.c b/sys/arch/sgi/localbus/com_lbus.c
index 835e05bcba0..7397f838c44 100644
--- a/sys/arch/sgi/localbus/com_lbus.c
+++ b/sys/arch/sgi/localbus/com_lbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_lbus.c,v 1.11 2009/10/26 18:00:06 miod Exp $ */
+/*	$OpenBSD: com_lbus.c,v 1.12 2012/10/03 22:46:09 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -31,7 +31,6 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
@@ -39,8 +38,6 @@
 #include <dev/ic/comvar.h>
 #include <dev/ic/ns16550reg.h>
 
-#include <mips64/archtype.h>
-
 #include <sgi/localbus/macebusvar.h>
 
 int	com_macebus_probe(struct device *, void *, void *);
diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c
index 924e64b5a34..7419d278b1f 100644
--- a/sys/arch/sgi/sgi/bus_dma.c
+++ b/sys/arch/sgi/sgi/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.29 2012/05/27 14:27:10 miod Exp $ */
+/*	$OpenBSD: bus_dma.c,v 1.30 2012/10/03 22:46:09 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -63,10 +63,8 @@
 
 #include <uvm/uvm.h>
 
-#include <mips64/archtype.h>
 #include <mips64/cache.h>
 #include <machine/cpu.h>
-#include <machine/autoconf.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/sgi/sgi/ip32_machdep.c b/sys/arch/sgi/sgi/ip32_machdep.c
index 7e4ce7863a3..ae867673641 100644
--- a/sys/arch/sgi/sgi/ip32_machdep.c
+++ b/sys/arch/sgi/sgi/ip32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip32_machdep.c,v 1.20 2012/10/03 11:18:23 miod Exp $ */
+/*	$OpenBSD: ip32_machdep.c,v 1.21 2012/10/03 22:46:09 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -42,7 +42,6 @@
 #include <machine/memconf.h>
 
 #include <mips64/arcbios.h>
-#include <mips64/archtype.h>
 
 #include <sgi/localbus/crimebus.h>
 #include <sgi/localbus/macebus.h>