Don't include sbusvar.h if you need neither sbus_translate() nor sbus_testdma().

18 files changed, 18 insertions, 44 deletions

diff --git a/sys/arch/sparc/dev/agten.c b/sys/arch/sparc/dev/agten.c
index 038cdde8863..5c93b5fa676 100644
--- a/sys/arch/sparc/dev/agten.c
+++ b/sys/arch/sparc/dev/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.13 2013/10/20 20:07:25 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.14 2015/03/28 19:07:07 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -80,8 +80,6 @@
 #include <dev/ic/p9000.h>
 #include <dev/ic/ibm561reg.h>
 
-#include <sparc/dev/sbusvar.h>
-
 struct agten_cmap {
 	u_int8_t	cm_red[256];
 	u_int8_t	cm_green[256];
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c
index d694d1d537c..eb15de77124 100644
--- a/sys/arch/sparc/dev/be.c
+++ b/sys/arch/sparc/dev/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.48 2014/12/22 02:26:54 tedu Exp $	*/
+/*	$OpenBSD: be.c,v 1.49 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -55,7 +55,6 @@
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/dmareg.h>
 #include <sparc/dev/dmavar.h>
 
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index de859ce62ef..27a04650d6d 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.39 2013/10/20 20:07:25 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.40 2015/03/28 19:07:07 miod Exp $	*/
 /*	$NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
 
 /*
@@ -69,7 +69,6 @@
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/bwtworeg.h>
-#include <sparc/dev/sbusvar.h>
 #if defined(SUN4)
 #include <sparc/dev/pfourreg.h>
 #endif
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index c2f363f8cca..16370190145 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.36 2013/10/20 20:07:25 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.37 2015/03/28 19:07:07 miod Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -96,7 +96,6 @@
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
 #include <sparc/dev/cgthreereg.h>
-#include <sparc/dev/sbusvar.h>
 
 /* per-display variables */
 struct cgthree_softc {
diff --git a/sys/arch/sparc/dev/cgtwelve.c b/sys/arch/sparc/dev/cgtwelve.c
index dee017dfad6..b8e83bbf47b 100644
--- a/sys/arch/sparc/dev/cgtwelve.c
+++ b/sys/arch/sparc/dev/cgtwelve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelve.c,v 1.19 2013/10/20 20:07:25 miod Exp $	*/
+/*	$OpenBSD: cgtwelve.c,v 1.20 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Miodrag Vallat.  All rights reserved.
@@ -69,7 +69,6 @@
 #include <machine/fbvar.h>
 
 #include <sparc/dev/cgtwelvereg.h>
-#include <sparc/dev/sbusvar.h>
 
 #include <dev/cons.h>	/* for prom console hook */
 
diff --git a/sys/arch/sparc/dev/daadio.c b/sys/arch/sparc/dev/daadio.c
index e14c2a1be68..6bc6c230e50 100644
--- a/sys/arch/sparc/dev/daadio.c
+++ b/sys/arch/sparc/dev/daadio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: daadio.c,v 1.6 2004/09/29 07:35:11 miod Exp $	*/
+/*	$OpenBSD: daadio.c,v 1.7 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -49,8 +49,6 @@
 #include <machine/autoconf.h>
 #include <sparc/cpu.h>
 #include <sparc/sparc/cpuvar.h>
-#include <sparc/dev/sbusvar.h>
-#include <sparc/dev/dmareg.h>	/* for SBUS_BURST_* */
 #include <machine/daadioio.h>
 
 #include <sparc/dev/fgareg.h>
diff --git a/sys/arch/sparc/dev/if_gem_sbus.c b/sys/arch/sparc/dev/if_gem_sbus.c
index c65a924254f..f77da305e20 100644
--- a/sys/arch/sparc/dev/if_gem_sbus.c
+++ b/sys/arch/sparc/dev/if_gem_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gem_sbus.c,v 1.3 2014/07/22 10:35:35 mpi Exp $	*/
+/*	$OpenBSD: if_gem_sbus.c,v 1.4 2015/03/28 19:07:07 miod Exp $	*/
 /*	$NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $	*/
 
 /*-
@@ -55,8 +55,6 @@
 #include <machine/bus.h>
 extern struct sparc_bus_dma_tag *iommu_dmatag;
 
-#include <sparc/dev/sbusvar.h>
-
 #include <dev/ic/gemreg.h>
 #include <dev/ic/gemvar.h>
 
diff --git a/sys/arch/sparc/dev/mgx.c b/sys/arch/sparc/dev/mgx.c
index 588df5297ec..240625ba76e 100644
--- a/sys/arch/sparc/dev/mgx.c
+++ b/sys/arch/sparc/dev/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.17 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.18 2015/03/28 19:07:07 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -66,8 +66,6 @@
 #include <dev/ic/vgareg.h>
 #include <dev/ic/atxxreg.h>
 
-#include <sparc/dev/sbusvar.h>
-
 /*
  * MGX PROM register layout
  *
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c
index 4b0350d41bd..e69fc49dcfe 100644
--- a/sys/arch/sparc/dev/p9000.c
+++ b/sys/arch/sparc/dev/p9000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9000.c,v 1.24 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: p9000.c,v 1.25 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -56,7 +56,6 @@
 #include <sparc/dev/btvar.h>
 #include <sparc/dev/bt445reg.h>
 #include <sparc/dev/bt445var.h>
-#include <sparc/dev/sbusvar.h>
 
 #include <dev/ic/p9000.h>
 
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 4086f9a9cca..e079e124264 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.52 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.53 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2005, 2006, 2008, Miodrag Vallat.
@@ -59,7 +59,6 @@
 
 #include <sparc/dev/btreg.h>
 #include <sparc/dev/btvar.h>
-#include <sparc/dev/sbusvar.h>
 
 #include <dev/ic/ibm525reg.h>
 #include <dev/ic/p9000.h>
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c
index b8382da3662..d31ac453e18 100644
--- a/sys/arch/sparc/dev/presto.c
+++ b/sys/arch/sparc/dev/presto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: presto.c,v 1.25 2013/06/11 16:42:11 deraadt Exp $	*/
+/*	$OpenBSD: presto.c,v 1.26 2015/03/28 19:07:07 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -41,8 +41,6 @@
 #include <machine/autoconf.h>
 #include <machine/conf.h>
 
-#include <sparc/dev/sbusvar.h>
-
 struct presto_softc {
 	struct	device	sc_dev;
 	struct	disk	sc_dk;
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c
index f80de7646d1..d7155680bc0 100644
--- a/sys/arch/sparc/dev/qe.c
+++ b/sys/arch/sparc/dev/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.37 2014/12/22 02:26:54 tedu Exp $	*/
+/*	$OpenBSD: qe.c,v 1.38 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 Jason L. Wright.
@@ -63,7 +63,6 @@
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/dmareg.h>
 #include <sparc/dev/dmavar.h>
 
diff --git a/sys/arch/sparc/dev/rfx.c b/sys/arch/sparc/dev/rfx.c
index 94703fbe316..fa4aa3fa2fb 100644
--- a/sys/arch/sparc/dev/rfx.c
+++ b/sys/arch/sparc/dev/rfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfx.c,v 1.16 2013/11/26 20:33:14 deraadt Exp $	*/
+/*	$OpenBSD: rfx.c,v 1.17 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -54,8 +54,6 @@
 #include <dev/rasops/rasops.h>
 #include <machine/fbvar.h>
 
-#include <sparc/dev/sbusvar.h>
-
 #include <dev/ic/bt463reg.h>
 
 /*
diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c
index d1324afd83f..72c0e52ceca 100644
--- a/sys/arch/sparc/dev/spif.c
+++ b/sys/arch/sparc/dev/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.27 2010/07/02 17:27:01 nicm Exp $	*/
+/*	$OpenBSD: spif.c,v 1.28 2015/03/28 19:07:07 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -49,7 +49,6 @@
 #include <machine/autoconf.h>
 #include <sparc/cpu.h>
 #include <sparc/sparc/cpuvar.h>
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/spifreg.h>
 #include <sparc/dev/spifvar.h>
 
diff --git a/sys/arch/sparc/dev/ts102.c b/sys/arch/sparc/dev/ts102.c
index 398ef0fccf8..78fa882f2d3 100644
--- a/sys/arch/sparc/dev/ts102.c
+++ b/sys/arch/sparc/dev/ts102.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ts102.c,v 1.20 2013/11/18 20:21:51 deraadt Exp $	*/
+/*	$OpenBSD: ts102.c,v 1.21 2015/03/28 19:07:08 miod Exp $	*/
 /*
  * Copyright (c) 2003, 2004, Miodrag Vallat.
  *
@@ -78,7 +78,6 @@
 #include <dev/pcmcia/pcmciavar.h>
 #include <dev/pcmcia/pcmciachip.h>
 
-#include <sparc/dev/sbusvar.h>
 #include <sparc/dev/tctrlvar.h>
 #include <sparc/dev/ts102reg.h>
 
diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c
index 71d87486b66..63e87bbc41a 100644
--- a/sys/arch/sparc/dev/tvtwo.c
+++ b/sys/arch/sparc/dev/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.18 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.19 2015/03/28 19:07:08 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2006, 2008, Miodrag Vallat.
@@ -69,8 +69,6 @@
 #include <dev/rasops/rasops.h>
 #include <machine/fbvar.h>
 
-#include <sparc/dev/sbusvar.h>
-
 /*
  * The memory layout of the board is as follows:
  *
diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c
index 2f09b2f33de..631035a52e9 100644
--- a/sys/arch/sparc/dev/vigra.c
+++ b/sys/arch/sparc/dev/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.19 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.20 2015/03/28 19:07:08 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -58,8 +58,6 @@
 #include <dev/rasops/rasops.h>
 #include <machine/fbvar.h>
 
-#include <sparc/dev/sbusvar.h>
-
 /*
  * The hardware information below has been gathered through experiments, as
  * well as the debug information of the SunOS 4.x vigfb driver.
diff --git a/sys/arch/sparc/dev/zx.c b/sys/arch/sparc/dev/zx.c
index 8fd7c137e45..c8e11c55dd5 100644
--- a/sys/arch/sparc/dev/zx.c
+++ b/sys/arch/sparc/dev/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.26 2013/10/20 20:07:26 miod Exp $	*/
+/*	$OpenBSD: zx.c,v 1.27 2015/03/28 19:07:08 miod Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -85,7 +85,6 @@
 #include <machine/fbvar.h>
 
 #include <dev/sbus/zxreg.h>
-#include <sparc/dev/sbusvar.h>
 
 #include <dev/cons.h>	/* for prom console hook */