From d368bbb82000d2c61abe2fbc3b6829afff372ebb Mon Sep 17 00:00:00 2001
From: dyoung <dyoung@NetBSD.org>
Date: Tue, 19 Jul 2011 15:59:51 +0000
Subject: [PATCH] Change <machine/bus.h> to <sys/bus.h> throughout.

Split bus.h -> bus_{defs,funcs}.h.

Mark acorn32/bus.h obsolete.
---
 distrib/sets/lists/comp/md.acorn32             | 4 ++--
 sys/arch/acorn32/acorn32/rpc_machdep.c         | 6 +++---
 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c | 6 +++---
 sys/arch/acorn32/eb7500atx/if_cs.c             | 6 +++---
 sys/arch/acorn32/eb7500atx/rsbus.c             | 7 +++----
 sys/arch/acorn32/eb7500atx/rsbus.h             | 5 ++---
 sys/arch/acorn32/eb7500atx/rsbus_io.c          | 6 +++---
 sys/arch/acorn32/eb7500atx/rside.c             | 6 +++---
 sys/arch/acorn32/include/Makefile              | 4 ++--
 sys/arch/acorn32/include/bus.h                 | 4 ----
 sys/arch/acorn32/include/bus_defs.h            | 4 ++++
 sys/arch/acorn32/include/bus_funcs.h           | 4 ++++
 sys/arch/acorn32/include/podulebus_machdep.h   | 4 ++--
 sys/arch/acorn32/mainbus/atppc_pioc.c          | 6 +++---
 sys/arch/acorn32/mainbus/com_pioc.c            | 6 +++---
 sys/arch/acorn32/mainbus/fd.c                  | 6 +++---
 sys/arch/acorn32/mainbus/lpt_pioc.c            | 6 +++---
 sys/arch/acorn32/mainbus/pioc.c                | 6 +++---
 sys/arch/acorn32/mainbus/piocvar.h             | 4 ++--
 sys/arch/acorn32/mainbus/wdc_pioc.c            | 6 +++---
 sys/arch/acorn32/podulebus/amps.c              | 6 +++---
 sys/arch/acorn32/podulebus/asc.c               | 6 +++---
 sys/arch/acorn32/podulebus/icside.c            | 6 +++---
 sys/arch/acorn32/podulebus/if_ne_pbus.c        | 6 +++---
 sys/arch/acorn32/podulebus/podulebus_io.c      | 6 +++---
 sys/arch/acorn32/podulebus/rapide.c            | 6 +++---
 sys/arch/acorn32/podulebus/sbic.c              | 6 +++---
 sys/arch/acorn32/podulebus/simide.c            | 6 +++---
 28 files changed, 78 insertions(+), 76 deletions(-)
 delete mode 100644 sys/arch/acorn32/include/bus.h
 create mode 100644 sys/arch/acorn32/include/bus_defs.h
 create mode 100644 sys/arch/acorn32/include/bus_funcs.h

diff --git a/distrib/sets/lists/comp/md.acorn32 b/distrib/sets/lists/comp/md.acorn32
index b2c28e1fbff3..d1a0cae6aba9 100644
--- a/distrib/sets/lists/comp/md.acorn32
+++ b/distrib/sets/lists/comp/md.acorn32
@@ -1,4 +1,4 @@
-# $NetBSD: md.acorn32,v 1.25 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.acorn32,v 1.26 2011/07/19 15:59:51 dyoung Exp $
 #./usr/include/acorn32/devmap.h		comp-c-include
 ./usr/include/acorn32				comp-c-include
 ./usr/include/acorn32/ansi.h			comp-c-include
@@ -6,7 +6,7 @@
 ./usr/include/acorn32/asm.h			comp-c-include
 ./usr/include/acorn32/beep.h			comp-obsolete		obsolete
 ./usr/include/acorn32/bswap.h			comp-c-include
-./usr/include/acorn32/bus.h			comp-c-include
+./usr/include/acorn32/bus.h			comp-obsolete		obsolete
 ./usr/include/acorn32/cdefs.h			comp-c-include
 ./usr/include/acorn32/conf.h			comp-obsolete		obsolete
 ./usr/include/acorn32/cpu.h			comp-c-include
diff --git a/sys/arch/acorn32/acorn32/rpc_machdep.c b/sys/arch/acorn32/acorn32/rpc_machdep.c
index d0450007aeb3..3b5672b4815d 100644
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $")
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 
@@ -85,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $")
 #include <arm/arm32/machdep.h>
 #include <arm/undefined.h>
 #include <machine/rtc.h>
-#include <machine/bus.h>
 
 #include <arm/iomd/vidc.h>
 #include <arm/iomd/iomdreg.h>
diff --git a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
index c428847d974d..3103e3364682 100644
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz Exp $	*/
+/*	$NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz E
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 
@@ -85,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz E
 #include <arm/arm32/machdep.h>
 #include <arm/undefined.h>
 #include <machine/rtc.h>
-#include <machine/bus.h>
 
 #include <arm/iomd/vidc.h>
 #include <arm/iomd/iomdreg.h>
diff --git a/sys/arch/acorn32/eb7500atx/if_cs.c b/sys/arch/acorn32/eb7500atx/if_cs.c
index 5e08d6a72f78..c60d68131d06 100644
--- a/sys/arch/acorn32/eb7500atx/if_cs.c
+++ b/sys/arch/acorn32/eb7500atx/if_cs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cs.c,v 1.6 2009/09/22 14:55:19 tsutsui Exp $	*/
+/*	$NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -58,12 +58,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.6 2009/09/22 14:55:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include "rnd.h"
 #if NRND > 0
@@ -74,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.6 2009/09/22 14:55:19 tsutsui Exp $");
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <acorn32/eb7500atx/rsbus.h>
diff --git a/sys/arch/acorn32/eb7500atx/rsbus.c b/sys/arch/acorn32/eb7500atx/rsbus.c
index aa8034f4f585..ee55491bae00 100644
--- a/sys/arch/acorn32/eb7500atx/rsbus.c
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.8 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -29,13 +29,12 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.8 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <acorn32/eb7500atx/rsbus.h>
 
diff --git a/sys/arch/acorn32/eb7500atx/rsbus.h b/sys/arch/acorn32/eb7500atx/rsbus.h
index 36876c951840..ad742ed9f83a 100644
--- a/sys/arch/acorn32/eb7500atx/rsbus.h
+++ b/sys/arch/acorn32/eb7500atx/rsbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.h,v 1.2 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: rsbus.h,v 1.3 2011/07/19 15:59:52 dyoung Exp $ */
 
 #ifndef _RSBUS_H_
 #define _RSBUS_H_
@@ -6,8 +6,7 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct rsbus_softc {
 	struct device sc_dev;
diff --git a/sys/arch/acorn32/eb7500atx/rsbus_io.c b/sys/arch/acorn32/eb7500atx/rsbus_io.c
index a75180606299..27619708901b 100644
--- a/sys/arch/acorn32/eb7500atx/rsbus_io.c
+++ b/sys/arch/acorn32/eb7500atx/rsbus_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsbus_io.c,v 1.2 2005/12/11 12:16:05 christos Exp $	*/
+/*	$NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -37,11 +37,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.2 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Proto types for all the bus_space structure functions */
 
diff --git a/sys/arch/acorn32/eb7500atx/rside.c b/sys/arch/acorn32/eb7500atx/rside.c
index ef52727d4ff4..0ac4e0e1e4df 100644
--- a/sys/arch/acorn32/eb7500atx/rside.c
+++ b/sys/arch/acorn32/eb7500atx/rside.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rside.c,v 1.10 2008/11/23 11:55:27 chris Exp $	*/
+/*	$NetBSD: rside.c,v 1.11 2011/07/19 15:59:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -56,17 +56,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.10 2008/11/23 11:55:27 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.11 2011/07/19 15:59:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
 #include <machine/io.h>
-#include <machine/bus.h>
 #include <acorn32/eb7500atx/rsidereg.h>
 #include <machine/irqhandler.h>
 
diff --git a/sys/arch/acorn32/include/Makefile b/sys/arch/acorn32/include/Makefile
index fd0bdbc4fab4..8c4442c63067 100644
--- a/sys/arch/acorn32/include/Makefile
+++ b/sys/arch/acorn32/include/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.26 2011/07/17 20:54:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.27 2011/07/19 15:59:52 dyoung Exp $
 
 INCSDIR= /usr/include/acorn32
 
 INCS=	ansi.h aout_machdep.h asm.h \
-	bswap.h bus.h \
+	bswap.h \
 	cdefs.h cpu.h \
 	disklabel.h \
 	elf_machdep.h endian.h endian_machdep.h \
diff --git a/sys/arch/acorn32/include/bus.h b/sys/arch/acorn32/include/bus.h
deleted file mode 100644
index 402e17fce5c9..000000000000
--- a/sys/arch/acorn32/include/bus.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: bus.h,v 1.1 2001/10/05 22:27:49 reinoud Exp $ */
-
-#include <arm/bus.h>
-
diff --git a/sys/arch/acorn32/include/bus_defs.h b/sys/arch/acorn32/include/bus_defs.h
new file mode 100644
index 000000000000..e435b68a4241
--- /dev/null
+++ b/sys/arch/acorn32/include/bus_defs.h
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
+
diff --git a/sys/arch/acorn32/include/bus_funcs.h b/sys/arch/acorn32/include/bus_funcs.h
new file mode 100644
index 000000000000..d10d96d5dc26
--- /dev/null
+++ b/sys/arch/acorn32/include/bus_funcs.h
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
+
diff --git a/sys/arch/acorn32/include/podulebus_machdep.h b/sys/arch/acorn32/include/podulebus_machdep.h
index 57085514a3c1..73ff6d44c161 100644
--- a/sys/arch/acorn32/include/podulebus_machdep.h
+++ b/sys/arch/acorn32/include/podulebus_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_machdep.h,v 1.3 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: podulebus_machdep.h,v 1.4 2011/07/19 15:59:53 dyoung Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/io.h>
 
 /* Define the structure used to describe a podule */
diff --git a/sys/arch/acorn32/mainbus/atppc_pioc.c b/sys/arch/acorn32/mainbus/atppc_pioc.c
index bfcae2291387..5d8fb28cf52c 100644
--- a/sys/arch/acorn32/mainbus/atppc_pioc.c
+++ b/sys/arch/acorn32/mainbus/atppc_pioc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $ */
+/* $NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -32,15 +32,15 @@
 #include "opt_atppc.h"
 
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 
 #include <arch/acorn32/mainbus/piocvar.h>
 
diff --git a/sys/arch/acorn32/mainbus/com_pioc.c b/sys/arch/acorn32/mainbus/com_pioc.c
index 2cbb83b62813..6c0645c89f47 100644
--- a/sys/arch/acorn32/mainbus/com_pioc.c
+++ b/sys/arch/acorn32/mainbus/com_pioc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_pioc.c,v 1.15 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.15 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/tty.h>
@@ -70,9 +70,9 @@ __KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.15 2011/06/03 07:35:37 matt Exp $");
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 #include <machine/io.h>
 
 #include <acorn32/mainbus/piocvar.h>
diff --git a/sys/arch/acorn32/mainbus/fd.c b/sys/arch/acorn32/mainbus/fd.c
index d5eddc796946..b5fb1f301bff 100644
--- a/sys/arch/acorn32/mainbus/fd.c
+++ b/sys/arch/acorn32/mainbus/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -104,6 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $");
 #include <sys/proc.h>
 #include <sys/fdio.h>
 #include <sys/conf.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -113,7 +114,6 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $");
 #include <machine/intr.h>
 #include <machine/io.h>
 #include <arm/arm32/katelib.h>
-#include <machine/bus.h>
 
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
diff --git a/sys/arch/acorn32/mainbus/lpt_pioc.c b/sys/arch/acorn32/mainbus/lpt_pioc.c
index 0ea1b314da1a..8e5cbafce6b8 100644
--- a/sys/arch/acorn32/mainbus/lpt_pioc.c
+++ b/sys/arch/acorn32/mainbus/lpt_pioc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_pioc.c,v 1.11 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: lpt_pioc.c,v 1.12 2011/07/19 15:59:53 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -36,12 +36,12 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: lpt_pioc.c,v 1.11 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_pioc.c,v 1.12 2011/07/19 15:59:53 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <acorn32/mainbus/piocvar.h>
 #include <dev/ic/lptreg.h>
diff --git a/sys/arch/acorn32/mainbus/pioc.c b/sys/arch/acorn32/mainbus/pioc.c
index 19af62ee0952..f65d8098af2a 100644
--- a/sys/arch/acorn32/mainbus/pioc.c
+++ b/sys/arch/acorn32/mainbus/pioc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pioc.c,v 1.16 2011/06/03 07:35:37 matt Exp $	*/     
+/*	$NetBSD: pioc.c,v 1.17 2011/07/19 15:59:53 dyoung Exp $	*/     
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -41,14 +41,14 @@
 /*#define PIOC_DEBUG*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.16 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.17 2011/07/19 15:59:53 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <arm/mainbus/mainbus.h>
 #include <acorn32/mainbus/piocreg.h>
 #include <acorn32/mainbus/piocvar.h>
diff --git a/sys/arch/acorn32/mainbus/piocvar.h b/sys/arch/acorn32/mainbus/piocvar.h
index c54e5eac5c74..78f912e9ee17 100644
--- a/sys/arch/acorn32/mainbus/piocvar.h
+++ b/sys/arch/acorn32/mainbus/piocvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: piocvar.h,v 1.1 2001/10/05 22:27:53 reinoud Exp $	*/
+/*	$NetBSD: piocvar.h,v 1.2 2011/07/19 15:59:53 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
  * Created      : 18/02/97
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * pioc driver attach arguments
diff --git a/sys/arch/acorn32/mainbus/wdc_pioc.c b/sys/arch/acorn32/mainbus/wdc_pioc.c
index 6688252629ea..959716d3608b 100644
--- a/sys/arch/acorn32/mainbus/wdc_pioc.c
+++ b/sys/arch/acorn32/mainbus/wdc_pioc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_pioc.c,v 1.24 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: wdc_pioc.c,v 1.25 2011/07/19 15:59:53 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe.
@@ -34,14 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.24 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.25 2011/07/19 15:59:53 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <acorn32/mainbus/piocvar.h>
diff --git a/sys/arch/acorn32/podulebus/amps.c b/sys/arch/acorn32/podulebus/amps.c
index 6b5ceac1942a..d10a9bb03316 100644
--- a/sys/arch/acorn32/podulebus/amps.c
+++ b/sys/arch/acorn32/podulebus/amps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: amps.c,v 1.18 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: amps.c,v 1.19 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.18 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.19 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,10 +52,10 @@ __KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.18 2011/06/03 07:35:37 matt Exp $");
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
 #include <machine/io.h>
-#include <machine/bus.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/ampsreg.h>
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/acorn32/podulebus/asc.c b/sys/arch/acorn32/podulebus/asc.c
index 26c898d41db0..28bda7bdfb96 100644
--- a/sys/arch/acorn32/podulebus/asc.c
+++ b/sys/arch/acorn32/podulebus/asc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asc.c,v 1.17 2011/06/03 07:35:37 matt Exp $	*/
+/*	$NetBSD: asc.c,v 1.18 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001 Richard Earnshaw
@@ -98,16 +98,16 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.17 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.18 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/bootconfig.h>		/* asc_poll */
 
diff --git a/sys/arch/acorn32/podulebus/icside.c b/sys/arch/acorn32/podulebus/icside.c
index 100839617c94..bc933ab45a81 100644
--- a/sys/arch/acorn32/podulebus/icside.c
+++ b/sys/arch/acorn32/podulebus/icside.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $	*/
+/*	$NetBSD: icside.c,v 1.29 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe
@@ -42,16 +42,16 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.29 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
 #include <machine/io.h>
-#include <machine/bus.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/icsidereg.h>
 
diff --git a/sys/arch/acorn32/podulebus/if_ne_pbus.c b/sys/arch/acorn32/podulebus/if_ne_pbus.c
index a85d6fe51ab2..3a1b97789740 100644
--- a/sys/arch/acorn32/podulebus/if_ne_pbus.c
+++ b/sys/arch/acorn32/podulebus/if_ne_pbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_pbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $	*/
+/*	$NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,20 +50,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/io.h>
 #include <dev/ic/dp8390reg.h>
diff --git a/sys/arch/acorn32/podulebus/podulebus_io.c b/sys/arch/acorn32/podulebus/podulebus_io.c
index 179a199cd791..9c3b4bf1808d 100644
--- a/sys/arch/acorn32/podulebus/podulebus_io.c
+++ b/sys/arch/acorn32/podulebus/podulebus_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: podulebus_io.c,v 1.6 2009/03/15 22:18:35 cegger Exp $	*/
+/*	$NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -37,11 +37,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.6 2009/03/15 22:18:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Proto types for all the bus_space structure functions */
 
diff --git a/sys/arch/acorn32/podulebus/rapide.c b/sys/arch/acorn32/podulebus/rapide.c
index f1727aef844f..d85c41e44b27 100644
--- a/sys/arch/acorn32/podulebus/rapide.c
+++ b/sys/arch/acorn32/podulebus/rapide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rapide.c,v 1.26 2008/03/18 20:46:35 cube Exp $	*/
+/*	$NetBSD: rapide.c,v 1.27 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe
@@ -68,17 +68,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.26 2008/03/18 20:46:35 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.27 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
 #include <machine/io.h>
-#include <machine/bus.h>
 #include <machine/bootconfig.h>
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
diff --git a/sys/arch/acorn32/podulebus/sbic.c b/sys/arch/acorn32/podulebus/sbic.c
index 8934a1e4b46c..437c6878ec0b 100644
--- a/sys/arch/acorn32/podulebus/sbic.c
+++ b/sys/arch/acorn32/podulebus/sbic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $ */
+/* $NetBSD: sbic.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Richard Earnshaw
@@ -114,17 +114,17 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h> /* For hz */
 #include <sys/device.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/arch/acorn32/podulebus/simide.c b/sys/arch/acorn32/podulebus/simide.c
index 3a0094a88308..2ca193a8c3f0 100644
--- a/sys/arch/acorn32/podulebus/simide.c
+++ b/sys/arch/acorn32/podulebus/simide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: simide.c,v 1.25 2008/03/18 20:46:35 cube Exp $	*/
+/*	$NetBSD: simide.c,v 1.26 2011/07/19 15:59:54 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe
@@ -40,17 +40,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.25 2008/03/18 20:46:35 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.26 2011/07/19 15:59:54 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
 #include <machine/io.h>
-#include <machine/bus.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/simidereg.h>