s/bus.h/bus.old.h/ to make the transit to the bus_space bus.h an easy road

possibly taken in small steps

8 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index d643af8d520..82c1d5bbaf9 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.11 1996/10/31 01:01:24 niklas Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.12 1996/11/12 20:30:15 niklas Exp $	*/
 
 /*
  * Generic driver for the aic7xxx based adaptec SCSI controllers
@@ -118,7 +118,7 @@
 #include <sys/systm.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <machine/intr.h>
 #endif /* defined(__NetBSD__) */
 
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index f37d5ce0a5d..7c06bfbed0e 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.26 1996/11/09 21:50:43 tholo Exp $	*/
+/*	$OpenBSD: com.c,v 1.27 1996/11/12 20:30:27 niklas Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*-
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <machine/intr.h>
 
 #include <dev/isa/isavar.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 14a17d9c091..96d56b7a0b7 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cy.c,v 1.3 1996/10/16 12:38:16 deraadt Exp $	*/
+/*	$OpenBSD: cy.c,v 1.4 1996/11/12 20:30:17 niklas Exp $	*/
 
 /*
  * cy.c
@@ -46,7 +46,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <machine/intr.h>
 
 #if NCY_ISA > 0	
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 6134e69697f..2732699b22c 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.14 1996/10/31 01:01:28 niklas Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.15 1996/11/12 20:30:18 niklas Exp $	*/
 /*	$NetBSD: elink3.c,v 1.7 1996/05/14 22:22:05 thorpej Exp $	*/
 
 /*
@@ -63,7 +63,7 @@
 #endif
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <machine/intr.h>
 
 #include <dev/ic/elink3var.h>
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 793d30b7ffb..61fe659c81a 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midway.c,v 1.14 1996/11/09 03:43:10 chuck Exp $	*/
+/*	$OpenBSD: midway.c,v 1.15 1996/11/12 20:30:20 niklas Exp $	*/
 /*	(sync'd to midway.c 1.63)	*/
 
 /*
@@ -114,7 +114,7 @@
 
 
 #if !defined(sparc) && !defined(__FreeBSD__)
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #endif
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
diff --git a/sys/dev/ic/midwayreg.h b/sys/dev/ic/midwayreg.h
index cbd43d5dc3e..54bf1f75596 100644
--- a/sys/dev/ic/midwayreg.h
+++ b/sys/dev/ic/midwayreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midwayreg.h,v 1.4 1996/07/16 22:08:16 chuck Exp $	*/
+/*	$OpenBSD: midwayreg.h,v 1.5 1996/11/12 20:30:21 niklas Exp $	*/
 
 /*
  * m i d w a y r e g . h
@@ -9,7 +9,7 @@
  */
 
 #if defined(sparc) || defined(__FreeBSD__)
-/* XXX: gross.   netbsd/sparc doesn't have machine/bus.h yet. */
+/* XXX: gross.   netbsd/sparc doesn't have machine/bus.old.h yet. */
 typedef void * bus_chipset_tag_t;
 typedef u_int32_t pci_chipset_tag_t;
 typedef caddr_t bus_mem_handle_t;
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index fe2607da168..a71f3baa264 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdqvar.h,v 1.8 1996/10/31 01:01:38 niklas Exp $	*/
+/*	$OpenBSD: pdqvar.h,v 1.9 1996/11/12 20:30:22 niklas Exp $	*/
 /*	$NetBSD: pdqvar.h,v 1.8 1996/07/10 18:55:05 cgd Exp $	*/
 
 /*-
@@ -127,7 +127,7 @@ typedef pdq_bus_memaddr_t pdq_bus_memoffset_t;
 
 
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <machine/intr.h>
 #define	PDQ_OS_PTR_FMT		"%p"
 typedef void ifnet_ret_t;
diff --git a/sys/dev/ic/smc93cx6.c b/sys/dev/ic/smc93cx6.c
index 4138fdd4954..5be19b4332d 100644
--- a/sys/dev/ic/smc93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc93cx6.c,v 1.4 1996/10/31 01:01:40 niklas Exp $	*/
+/*	$OpenBSD: smc93cx6.c,v 1.5 1996/11/12 20:30:23 niklas Exp $	*/
 
 /*
  * Interface for the 93C46/26/06 serial eeprom parts.
@@ -59,7 +59,7 @@
 #include <machine/clock.h>
 #include <i386/scsi/93cx6.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
-#include <machine/bus.h>
+#include <machine/bus.old.h>
 #include <dev/ic/smc93cx6var.h>
 #endif