From b6584574fc253d1725f8f78df132828a069a8437 Mon Sep 17 00:00:00 2001
From: dyoung <dyoung@NetBSD.org>
Date: Fri, 1 Jul 2011 18:41:51 +0000
Subject: [PATCH] #include <sys/bus.h> instead of <machine/bus.h>.

---
 sys/arch/evbmips/adm5120/mainbus.c       | 6 +++---
 sys/arch/evbmips/alchemy/dbau1500.c      | 6 +++---
 sys/arch/evbmips/alchemy/dbau1550.c      | 6 +++---
 sys/arch/evbmips/alchemy/genericbd.c     | 6 +++---
 sys/arch/evbmips/alchemy/mach_intr.c     | 6 +++---
 sys/arch/evbmips/alchemy/mtx-1.c         | 6 +++---
 sys/arch/evbmips/alchemy/obio.c          | 6 +++---
 sys/arch/evbmips/alchemy/omsal400.c      | 6 +++---
 sys/arch/evbmips/atheros/mach_intr.c     | 6 +++---
 sys/arch/evbmips/gdium/bonito_mainbus.c  | 6 +++---
 sys/arch/evbmips/gdium/gdium_dma.c       | 6 +++---
 sys/arch/evbmips/gdium/gdium_genfb.c     | 6 +++---
 sys/arch/evbmips/gdium/gdium_intr.c      | 6 +++---
 sys/arch/evbmips/gdium/gdiumvar.h        | 4 ++--
 sys/arch/evbmips/isa/isadma_bounce.c     | 6 +++---
 sys/arch/evbmips/isa/mcclock_isa.c       | 6 +++---
 sys/arch/evbmips/malta/autoconf.h        | 4 ++--
 sys/arch/evbmips/malta/malta_dma.c       | 6 +++---
 sys/arch/evbmips/malta/maltavar.h        | 4 ++--
 sys/arch/evbmips/malta/pci/pci_machdep.c | 6 +++---
 sys/arch/evbmips/malta/pci/pcib.c        | 6 +++---
 sys/arch/macppc/dev/adb.c                | 6 +++---
 sys/arch/macppc/dev/am79c950.c           | 6 +++---
 sys/arch/macppc/dev/battery.c            | 6 +++---
 sys/arch/macppc/dev/com_mainbus.c        | 2 +-
 sys/arch/macppc/dev/cuda.c               | 6 +++---
 sys/arch/macppc/dev/if_mc.c              | 6 +++---
 sys/arch/macppc/dev/if_wi_obio.c         | 6 +++---
 sys/arch/macppc/dev/kauai.c              | 6 +++---
 sys/arch/macppc/dev/ofb.c                | 6 +++---
 sys/arch/macppc/dev/pmu.c                | 6 +++---
 sys/arch/macppc/dev/smartbat.c           | 6 +++---
 sys/arch/macppc/dev/wdc_obio.c           | 6 +++---
 sys/arch/macppc/macppc/rbus_machdep.c    | 6 +++---
 sys/arch/macppc/pci/agp_machdep.c        | 6 +++---
 sys/arch/macppc/pci/pci_machdep.c        | 6 +++---
 sys/arch/sparc/dev/bootbus.c             | 6 +++---
 sys/arch/sparc/dev/cgsix_obio.c          | 6 +++---
 sys/arch/sparc/dev/com_ebus.c            | 6 +++---
 sys/arch/sparc/dev/com_obio.c            | 6 +++---
 sys/arch/sparc/dev/dma_obio.c            | 6 +++---
 sys/arch/sparc/dev/ebus.c                | 6 +++---
 sys/arch/sparc/dev/esp_obio.c            | 6 +++---
 sys/arch/sparc/dev/if_ie_obio.c          | 6 +++---
 sys/arch/sparc/dev/if_le_obio.c          | 6 +++---
 sys/arch/sparc/dev/kbd_pckbport.c        | 6 +++---
 sys/arch/sparc/dev/ms_pckbport.c         | 6 +++---
 sys/arch/sparc/dev/obio.c                | 6 +++---
 sys/arch/sparc/dev/rtc.c                 | 6 +++---
 sys/arch/sparc/dev/sbus.c                | 6 +++---
 sys/arch/sparc/dev/sw.c                  | 6 +++---
 sys/arch/sparc/dev/tctrl.c               | 6 +++---
 sys/arch/sparc/dev/ts102.c               | 4 ++--
 sys/arch/sparc/dev/vme_machdep.c         | 6 +++---
 sys/arch/sparc/sparc/clock.c             | 6 +++---
 sys/arch/sparc/sparc/cpuunit.c           | 6 +++---
 sys/arch/sparc/sparc/eeprom.c            | 6 +++---
 sys/arch/sparc/sparc/genassym.cf         | 4 ++--
 sys/arch/sparc/sparc/iommu.c             | 6 +++---
 sys/arch/sparc/sparc/memecc.c            | 6 +++---
 sys/arch/sparc/sparc/mkclock.c           | 6 +++---
 sys/arch/sparc/sparc/msiiep.c            | 6 +++---
 sys/arch/sparc/sparc/oclock.c            | 6 +++---
 sys/arch/sparc/sparc/pci_machdep.c       | 6 +++---
 sys/arch/sparc/sparc/timer.c             | 6 +++---
 sys/arch/sparc/sparc/timer_sun4.c        | 6 +++---
 sys/arch/sparc64/dev/com_ebus.c          | 6 +++---
 sys/arch/sparc64/dev/ebus.c              | 6 +++---
 sys/arch/sparc64/dev/ebus_mainbus.c      | 4 ++--
 sys/arch/sparc64/dev/ebusvar.h           | 4 ++--
 sys/arch/sparc64/dev/ffb.c               | 6 +++---
 sys/arch/sparc64/dev/ffb_mainbus.c       | 6 +++---
 sys/arch/sparc64/dev/gfb.c               | 6 +++---
 sys/arch/sparc64/dev/iommu.c             | 6 +++---
 sys/arch/sparc64/dev/lpt_ebus.c          | 6 +++---
 sys/arch/sparc64/dev/mkclock.c           | 6 +++---
 sys/arch/sparc64/dev/pcfiic_ebus.c       | 4 ++--
 sys/arch/sparc64/dev/pci_machdep.c       | 6 +++---
 sys/arch/sparc64/dev/psm.c               | 6 +++---
 sys/arch/sparc64/dev/psycho.c            | 6 +++---
 sys/arch/sparc64/dev/pyro.c              | 4 ++--
 sys/arch/sparc64/dev/rtc.c               | 6 +++---
 sys/arch/sparc64/dev/sbus.c              | 6 +++---
 sys/arch/sparc64/dev/sbusvar.h           | 4 ++--
 sys/arch/sparc64/dev/schizo.c            | 4 ++--
 sys/arch/sparc64/dev/upa.c               | 2 +-
 sys/arch/sparc64/sparc64/autoconf.c      | 6 +++---
 sys/arch/sparc64/sparc64/clock.c         | 6 +++---
 sys/arch/sparc64/sparc64/core_machdep.c  | 6 +++---
 sys/arch/sparc64/sparc64/rbus_machdep.c  | 6 +++---
 sys/arch/sparc64/sparc64/vm_machdep.c    | 6 +++---
 91 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/sys/arch/evbmips/adm5120/mainbus.c b/sys/arch/evbmips/adm5120/mainbus.c
index 091e893b2a77..3a0b3e166a7d 100644
--- a/sys/arch/evbmips/adm5120/mainbus.c
+++ b/sys/arch/evbmips/adm5120/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,13 +66,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff --git a/sys/arch/evbmips/alchemy/dbau1500.c b/sys/arch/evbmips/alchemy/dbau1500.c
index 66c53ff75b42..cdf1454cd9c1 100644
--- a/sys/arch/evbmips/alchemy/dbau1500.c
+++ b/sys/arch/evbmips/alchemy/dbau1500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff --git a/sys/arch/evbmips/alchemy/dbau1550.c b/sys/arch/evbmips/alchemy/dbau1550.c
index 3f03ee1a365b..e291ce3478a3 100644
--- a/sys/arch/evbmips/alchemy/dbau1550.c
+++ b/sys/arch/evbmips/alchemy/dbau1550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,13 +32,13 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
diff --git a/sys/arch/evbmips/alchemy/genericbd.c b/sys/arch/evbmips/alchemy/genericbd.c
index 74906407a829..88b00e3ff5cd 100644
--- a/sys/arch/evbmips/alchemy/genericbd.c
+++ b/sys/arch/evbmips/alchemy/genericbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genericbd.c,v 1.2 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.2 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff --git a/sys/arch/evbmips/alchemy/mach_intr.c b/sys/arch/evbmips/alchemy/mach_intr.c
index 9acd70bb755d..94463f3d4429 100644
--- a/sys/arch/evbmips/alchemy/mach_intr.c
+++ b/sys/arch/evbmips/alchemy/mach_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_intr.c,v 1.4 2011/02/20 07:48:33 matt Exp $	*/
+/*	$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2011/02/20 07:48:33 matt Exp $");
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/evbmips/alchemy/mtx-1.c b/sys/arch/evbmips/alchemy/mtx-1.c
index 11f72e2237b5..a1855f1b1287 100644
--- a/sys/arch/evbmips/alchemy/mtx-1.c
+++ b/sys/arch/evbmips/alchemy/mtx-1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff --git a/sys/arch/evbmips/alchemy/obio.c b/sys/arch/evbmips/alchemy/obio.c
index 73e0dcfc8486..d4943ca45557 100644
--- a/sys/arch/evbmips/alchemy/obio.c
+++ b/sys/arch/evbmips/alchemy/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.3 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: obio.c,v 1.4 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff --git a/sys/arch/evbmips/alchemy/omsal400.c b/sys/arch/evbmips/alchemy/omsal400.c
index 098591afbf67..be5e7aebc9d4 100644
--- a/sys/arch/evbmips/alchemy/omsal400.c
+++ b/sys/arch/evbmips/alchemy/omsal400.c
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -36,10 +36,10 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/dev/augpiovar.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
diff --git a/sys/arch/evbmips/atheros/mach_intr.c b/sys/arch/evbmips/atheros/mach_intr.c
index 72e483cd382a..e7b00b2f084e 100644
--- a/sys/arch/evbmips/atheros/mach_intr.c
+++ b/sys/arch/evbmips/atheros/mach_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $	*/
+/*	$NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $");
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/evbmips/gdium/bonito_mainbus.c b/sys/arch/evbmips/gdium/bonito_mainbus.c
index 3db4656b8cbe..d4268497c234 100644
--- a/sys/arch/evbmips/gdium/bonito_mainbus.c
+++ b/sys/arch/evbmips/gdium/bonito_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Ex
 #include <sys/reboot.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/bonito/bonitoreg.h>
 
diff --git a/sys/arch/evbmips/gdium/gdium_dma.c b/sys/arch/evbmips/gdium/gdium_dma.c
index 204d2a3f784f..c511a6059d89 100644
--- a/sys/arch/evbmips/gdium/gdium_dma.c
+++ b/sys/arch/evbmips/gdium/gdium_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $	*/
+/*	$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define	_MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbmips/gdium/gdiumreg.h>
 #include <evbmips/gdium/gdiumvar.h>
diff --git a/sys/arch/evbmips/gdium/gdium_genfb.c b/sys/arch/evbmips/gdium/gdium_genfb.c
index 96550ae20ad0..0339e62f06dc 100644
--- a/sys/arch/evbmips/gdium/gdium_genfb.c
+++ b/sys/arch/evbmips/gdium/gdium_genfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $	*/
+/*	$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/arch/evbmips/gdium/gdium_intr.c b/sys/arch/evbmips/gdium/gdium_intr.c
index dea930975ea0..5ae2947ef733 100644
--- a/sys/arch/evbmips/gdium/gdium_intr.c
+++ b/sys/arch/evbmips/gdium/gdium_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_intr.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $	*/
+/*	$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
 
 #define __INTR_PRIVATE
 
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $"
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/evbmips/gdium/gdiumvar.h b/sys/arch/evbmips/gdium/gdiumvar.h
index b42b038e92b7..4ec2f1000dc4 100644
--- a/sys/arch/evbmips/gdium/gdiumvar.h
+++ b/sys/arch/evbmips/gdium/gdiumvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdiumvar.h,v 1.1 2009/08/06 00:50:26 matt Exp $	*/
+/*	$NetBSD: gdiumvar.h,v 1.2 2011/07/01 18:45:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 
 #include <mips/bonito/bonitovar.h>
diff --git a/sys/arch/evbmips/isa/isadma_bounce.c b/sys/arch/evbmips/isa/isadma_bounce.c
index ab615aa9459e..6d13767f0630 100644
--- a/sys/arch/evbmips/isa/isadma_bounce.c
+++ b/sys/arch/evbmips/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp
 
 #include <mips/cache.h>
 #define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/evbmips/isa/mcclock_isa.c b/sys/arch/evbmips/isa/mcclock_isa.c
index 3251733c1b4b..fbc40ce71cd4 100644
--- a/sys/arch/evbmips/isa/mcclock_isa.c
+++ b/sys/arch/evbmips/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $	*/
+/*	$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
diff --git a/sys/arch/evbmips/malta/autoconf.h b/sys/arch/evbmips/malta/autoconf.h
index 7e981cf2cd10..a4b8f25ec466 100644
--- a/sys/arch/evbmips/malta/autoconf.h
+++ b/sys/arch/evbmips/malta/autoconf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.1 2002/03/07 14:44:03 simonb Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.2 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct mainbus_attach_args {
 	const char	*ma_name;
diff --git a/sys/arch/evbmips/malta/malta_dma.c b/sys/arch/evbmips/malta/malta_dma.c
index 752cea67e0d8..75199e412c36 100644
--- a/sys/arch/evbmips/malta/malta_dma.c
+++ b/sys/arch/evbmips/malta/malta_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $	*/
+/*	$NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,13 +34,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 
 #define	_MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isavar.h>
 
diff --git a/sys/arch/evbmips/malta/maltavar.h b/sys/arch/evbmips/malta/maltavar.h
index e4083ebd83a8..f0b987cae646 100644
--- a/sys/arch/evbmips/malta/maltavar.h
+++ b/sys/arch/evbmips/malta/maltavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: maltavar.h,v 1.5 2011/02/20 07:48:34 matt Exp $	*/
+/*	$NetBSD: maltavar.h,v 1.6 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/isa/isavar.h>
 
diff --git a/sys/arch/evbmips/malta/pci/pci_machdep.c b/sys/arch/evbmips/malta/pci/pci_machdep.c
index 5d5637917bd6..cf995d8b1e60 100644
--- a/sys/arch/evbmips/malta/pci/pci_machdep.c
+++ b/sys/arch/evbmips/malta/pci/pci_machdep.c
@@ -1,13 +1,13 @@
-/*	$NetBSD: pci_machdep.c,v 1.5 2011/02/20 07:48:35 matt Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.6 2011/07/01 18:46:35 dyoung Exp $	*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2011/07/01 18:46:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 
 #define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * PCI doesn't have any special needs; just use
diff --git a/sys/arch/evbmips/malta/pci/pcib.c b/sys/arch/evbmips/malta/pci/pcib.c
index 1b36a564cf4b..83291a81908a 100644
--- a/sys/arch/evbmips/malta/pci/pcib.c
+++ b/sys/arch/evbmips/malta/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.14 2011/02/20 07:48:35 matt Exp $	*/
+/*	$NetBSD: pcib.c,v 1.15 2011/07/01 18:46:35 dyoung Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.15 2011/07/01 18:46:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/02/20 07:48:35 matt Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <evbmips/malta/maltareg.h>
 #include <evbmips/malta/maltavar.h>
 #include <evbmips/malta/dev/gtreg.h>
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 006503dcbf52..998bb67a23b0 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $	*/
+/*	$NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $	*/
 
 /*-
  * Copyright (C) 1994	Bradley A. Grantham
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.31 2011/06/30 00:52:57 matt Exp $");
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 
diff --git a/sys/arch/macppc/dev/am79c950.c b/sys/arch/macppc/dev/am79c950.c
index 5fc23de3bc16..39ffb2664dbd 100644
--- a/sys/arch/macppc/dev/am79c950.c
+++ b/sys/arch/macppc/dev/am79c950.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $	*/
+/*	$NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.31 2011/07/01 18:41:51 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.30 2010/12/20 00:25:37 matt Exp $");
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <macppc/dev/am79c950reg.h>
 #include <macppc/dev/if_mcvar.h>
diff --git a/sys/arch/macppc/dev/battery.c b/sys/arch/macppc/dev/battery.c
index 52c05808fd50..2793508cb007 100644
--- a/sys/arch/macppc/dev/battery.c
+++ b/sys/arch/macppc/dev/battery.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $ */
+/*	$NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.13 2011/07/01 18:41:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: battery.c,v 1.12 2011/06/18 08:08:28 matt Exp $");
 
 #include <macppc/dev/pmuvar.h>
 #include <macppc/dev/batteryvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pio.h>
 #include "opt_battery.h"
 
diff --git a/sys/arch/macppc/dev/com_mainbus.c b/sys/arch/macppc/dev/com_mainbus.c
index 198ff976eae5..b51d6250a68c 100644
--- a/sys/arch/macppc/dev/com_mainbus.c
+++ b/sys/arch/macppc/dev/com_mainbus.c
@@ -41,7 +41,7 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/ofw/openfirm.h>
 
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/macppc/dev/cuda.c b/sys/arch/macppc/dev/cuda.c
index 2e14a09b16da..359934e9c018 100644
--- a/sys/arch/macppc/dev/cuda.c
+++ b/sys/arch/macppc/dev/cuda.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $ */
+/*	$NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.17 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.16 2011/06/18 08:08:28 matt Exp $");
 #include <sys/proc.h>
 #include <sys/mutex.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 #include <dev/clock_subr.h>
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 5a0663e03aa8..1f46a507fea2 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc.c,v 1.20 2011/06/30 00:52:57 matt Exp $	*/
+/*	$NetBSD: if_mc.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.20 2011/06/30 00:52:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.20 2011/06/30 00:52:57 matt Exp $");
 
 #include <dev/ofw/openfirm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 
diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 9e4f84f8decf..49adc3e2bd4e 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wi_obio.c,v 1.22 2011/06/18 08:08:28 matt Exp $	*/
+/*	$NetBSD: if_wi_obio.c,v 1.23 2011/07/01 18:41:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.22 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.23 2011/07/01 18:41:52 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.22 2011/06/18 08:08:28 matt Exp $")
 #endif
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/wi_ieee.h>
 #include <dev/ic/wireg.h>
diff --git a/sys/arch/macppc/dev/kauai.c b/sys/arch/macppc/dev/kauai.c
index b39fa8f5964c..781625fe9547 100644
--- a/sys/arch/macppc/dev/kauai.c
+++ b/sys/arch/macppc/dev/kauai.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kauai.c,v 1.27 2009/11/18 22:51:07 dyoung Exp $	*/
+/*	$NetBSD: kauai.c,v 1.28 2011/07/01 18:41:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2003 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.27 2009/11/18 22:51:07 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.28 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.27 2009/11/18 22:51:07 dyoung Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pio.h>
 
 #include <dev/ata/atareg.h>
diff --git a/sys/arch/macppc/dev/ofb.c b/sys/arch/macppc/dev/ofb.c
index db0fe0309d1a..b8ef60f65987 100644
--- a/sys/arch/macppc/dev/ofb.c
+++ b/sys/arch/macppc/dev/ofb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofb.c,v 1.66 2011/06/18 08:08:28 matt Exp $	*/
+/*	$NetBSD: ofb.c,v 1.67 2011/07/01 18:41:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.66 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.67 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.66 2011/06/18 08:08:28 matt Exp $");
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/grfioctl.h>
 
diff --git a/sys/arch/macppc/dev/pmu.c b/sys/arch/macppc/dev/pmu.c
index d9250c5403d2..3ef16feaa2bc 100644
--- a/sys/arch/macppc/dev/pmu.c
+++ b/sys/arch/macppc/dev/pmu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmu.c,v 1.20 2011/06/18 08:08:28 matt Exp $ */
+/*	$NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.20 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.20 2011/06/18 08:08:28 matt Exp $");
 #include <sys/proc.h>
 #include <sys/kthread.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/autoconf.h>
 #include <dev/clock_subr.h>
diff --git a/sys/arch/macppc/dev/smartbat.c b/sys/arch/macppc/dev/smartbat.c
index a9ed9c908973..420e97928aa1 100644
--- a/sys/arch/macppc/dev/smartbat.c
+++ b/sys/arch/macppc/dev/smartbat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smartbat.c,v 1.5 2011/06/18 08:08:28 matt Exp $ */
+/*	$NetBSD: smartbat.c,v 1.6 2011/07/01 18:41:52 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smartbat.c,v 1.5 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smartbat.c,v 1.6 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: smartbat.c,v 1.5 2011/06/18 08:08:28 matt Exp $");
 
 #include <macppc/dev/pmuvar.h>
 #include <macppc/dev/batteryvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include "opt_battery.h"
 
 #ifdef SMARTBAT_DEBUG
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 298ad1fea3f8..5858aa24fe92 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_obio.c,v 1.52 2009/11/18 22:51:07 dyoung Exp $	*/
+/*	$NetBSD: wdc_obio.c,v 1.53 2011/07/01 18:41:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.52 2009/11/18 22:51:07 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.53 2011/07/01 18:41:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.52 2009/11/18 22:51:07 dyoung Exp $")
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 
diff --git a/sys/arch/macppc/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c
index 44f42a098898..04c120d8ad68 100644
--- a/sys/arch/macppc/macppc/rbus_machdep.c
+++ b/sys/arch/macppc/macppc/rbus_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.17 2010/12/20 00:25:37 matt Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.18 2011/07/01 18:43:05 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999
@@ -28,14 +28,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.17 2010/12/20 00:25:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.18 2011/07/01 18:43:05 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 
 #include <powerpc/oea/bat.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/arch/macppc/pci/agp_machdep.c b/sys/arch/macppc/pci/agp_machdep.c
index fa981f0b0b3f..82e5c40c28d5 100644
--- a/sys/arch/macppc/pci/agp_machdep.c
+++ b/sys/arch/macppc/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_machdep.c,v 1.2 2008/04/29 06:53:02 martin Exp $ */
+/*	$NetBSD: agp_machdep.c,v 1.3 2011/07/01 18:43:05 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,14 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.2 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.3 2011/07/01 18:43:05 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/macppc/pci/pci_machdep.c b/sys/arch/macppc/pci/pci_machdep.c
index 19a1365e353e..54aacaaffd0c 100644
--- a/sys/arch/macppc/pci/pci_machdep.c
+++ b/sys/arch/macppc/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.39 2011/06/18 08:08:28 matt Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.40 2011/07/01 18:43:05 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.39 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.40 2011/07/01 18:43:05 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.39 2011/06/18 08:08:28 matt Exp $"
 #include <sys/device.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
diff --git a/sys/arch/sparc/dev/bootbus.c b/sys/arch/sparc/dev/bootbus.c
index 1a5168bb1c10..b0c5ce2693b2 100644
--- a/sys/arch/sparc/dev/bootbus.c
+++ b/sys/arch/sparc/dev/bootbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $	*/
+/*	$NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.18 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $")
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <sparc/sparc/cpuunitvar.h>
 #include <sparc/dev/bootbusvar.h>
diff --git a/sys/arch/sparc/dev/cgsix_obio.c b/sys/arch/sparc/dev/cgsix_obio.c
index 8eebe1b96955..16b8c672220a 100644
--- a/sys/arch/sparc/dev/cgsix_obio.c
+++ b/sys/arch/sparc/dev/cgsix_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $ */
+/*	$NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.23 2008/12/12 18:50:13 macallan Exp
 #include <sys/syslog.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 
diff --git a/sys/arch/sparc/dev/com_ebus.c b/sys/arch/sparc/dev/com_ebus.c
index 4d78baea46b4..630b3c930581 100644
--- a/sys/arch/sparc/dev/com_ebus.c
+++ b/sys/arch/sparc/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ebus.c,v 1.15 2008/04/28 20:23:35 martin Exp $ */
+/*	$NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.15 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.16 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
diff --git a/sys/arch/sparc/dev/com_obio.c b/sys/arch/sparc/dev/com_obio.c
index 8e3a77d6386f..7782300171a4 100644
--- a/sys/arch/sparc/dev/com_obio.c
+++ b/sys/arch/sparc/dev/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.23 2009/11/21 04:16:51 rmind Exp $");
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
diff --git a/sys/arch/sparc/dev/dma_obio.c b/sys/arch/sparc/dev/dma_obio.c
index ab1432fbec6f..3a914fe74c25 100644
--- a/sys/arch/sparc/dev/dma_obio.c
+++ b/sys/arch/sparc/dev/dma_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma_obio.c,v 1.11 2008/04/28 20:23:35 martin Exp $ */
+/*	$NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.11 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.12 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v 1.11 2008/04/28 20:23:35 martin Exp $")
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 
diff --git a/sys/arch/sparc/dev/ebus.c b/sys/arch/sparc/dev/ebus.c
index b6c941114489..8329ee85c983 100644
--- a/sys/arch/sparc/dev/ebus.c
+++ b/sys/arch/sparc/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $ */
+/*	$NetBSD: ebus.c,v 1.32 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.32 2011/07/01 18:50:41 dyoung Exp $");
 
 #if defined(DEBUG) && !defined(EBUS_DEBUG)
 #define EBUS_DEBUG
@@ -60,7 +60,7 @@ int ebus_debug = 0;
 #include <sys/kernel.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/sparc/dev/esp_obio.c b/sys/arch/sparc/dev/esp_obio.c
index 2a79d8af9f57..ec823846c7d4 100644
--- a/sys/arch/sparc/dev/esp_obio.c
+++ b/sys/arch/sparc/dev/esp_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v 1.24 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v 1.23 2008/04/28 20:23:35 martin Exp $")
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_message.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
diff --git a/sys/arch/sparc/dev/if_ie_obio.c b/sys/arch/sparc/dev/if_ie_obio.c
index 6b655a9ea201..0ab95e530d19 100644
--- a/sys/arch/sparc/dev/if_ie_obio.c
+++ b/sys/arch/sparc/dev/if_ie_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_obio.c,v 1.39 2011/06/03 16:28:40 tsutsui Exp $	*/
+/*	$NetBSD: if_ie_obio.c,v 1.40 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.39 2011/06/03 16:28:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.40 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.39 2011/06/03 16:28:40 tsutsui Exp
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc/dev/if_le_obio.c b/sys/arch/sparc/dev/if_le_obio.c
index 52d8b1487ec3..7b64ad9fbc76 100644
--- a/sys/arch/sparc/dev/if_le_obio.c
+++ b/sys/arch/sparc/dev/if_le_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_obio.c,v 1.26 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: if_le_obio.c,v 1.27 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_obio.c,v 1.26 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_obio.c,v 1.27 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_obio.c,v 1.26 2008/04/28 20:23:35 martin Exp $
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc/dev/kbd_pckbport.c b/sys/arch/sparc/dev/kbd_pckbport.c
index 61ccfc220e7a..91bfb8ef9d68 100644
--- a/sys/arch/sparc/dev/kbd_pckbport.c
+++ b/sys/arch/sparc/dev/kbd_pckbport.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd_pckbport.c,v 1.5 2008/04/28 20:23:35 martin Exp $ */
+/*	$NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Valeriy E. Ushakov
@@ -90,7 +90,7 @@
  *	@(#)pccons.c	5.11 (Berkeley) 5/21/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.5 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $");
 
 /*
  * Serve JavaStation-1 PS/2 keyboard as a Type5 keyboard with US101A
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: kbd_pckbport.c,v 1.5 2008/04/28 20:23:35 martin Exp
 #include <sys/select.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/sun/kbd_reg.h>
diff --git a/sys/arch/sparc/dev/ms_pckbport.c b/sys/arch/sparc/dev/ms_pckbport.c
index 7162187ac211..c7932e0cb5ca 100644
--- a/sys/arch/sparc/dev/ms_pckbport.c
+++ b/sys/arch/sparc/dev/ms_pckbport.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ms_pckbport.c,v 1.5 2009/01/17 14:35:06 he Exp $ */
+/*	$NetBSD: ms_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_pckbport.c,v 1.5 2009/01/17 14:35:06 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_pckbport.c,v 1.6 2011/07/01 18:50:41 dyoung Exp $");
 
 /*
  * Attach PS/2 mouse at pckbport aux port
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ms_pckbport.c,v 1.5 2009/01/17 14:35:06 he Exp $");
 #include <sys/proc.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pckbport/pckbportvar.h>
diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c
index 1a5d7051b974..a62c2517d4d1 100644
--- a/sys/arch/sparc/dev/obio.c
+++ b/sys/arch/sparc/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.71 2008/05/17 18:11:32 macallan Exp $	*/
+/*	$NetBSD: obio.c,v 1.72 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.71 2008/05/17 18:11:32 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.72 2011/07/01 18:50:41 dyoung Exp $");
 
 #include "locators.h"
 
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.71 2008/05/17 18:11:32 macallan Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sparc/dev/sbusvar.h>
 #include <machine/autoconf.h>
 #include <machine/oldmon.h>
diff --git a/sys/arch/sparc/dev/rtc.c b/sys/arch/sparc/dev/rtc.c
index 5e4ec524b8a8..937ca3938a79 100644
--- a/sys/arch/sparc/dev/rtc.c
+++ b/sys/arch/sparc/dev/rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtc.c,v 1.16 2009/12/12 14:44:09 tsutsui Exp $ */
+/*	$NetBSD: rtc.c,v 1.17 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Valeriy E. Ushakov
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.17 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16 2009/12/12 14:44:09 tsutsui Exp $");
 #include <sys/gmon.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <dev/clock_subr.h>
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index cff08a0e42c9..adafe88b1501 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbus.c,v 1.74 2010/01/03 23:03:20 mrg Exp $ */
+/*	$NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.74 2010/01/03 23:03:20 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.75 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.74 2010/01/03 23:03:20 mrg Exp $");
 #include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sparc/dev/sbusreg.h>
 #include <dev/sbus/sbusvar.h>
 #include <dev/sbus/xboxvar.h>
diff --git a/sys/arch/sparc/dev/sw.c b/sys/arch/sparc/dev/sw.c
index 0605de7ae36a..8547e6a0f50f 100644
--- a/sys/arch/sparc/dev/sw.c
+++ b/sys/arch/sparc/dev/sw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sw.c,v 1.22 2008/12/16 22:35:25 christos Exp $	*/
+/*	$NetBSD: sw.c,v 1.23 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.22 2008/12/16 22:35:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.23 2011/07/01 18:50:41 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.22 2008/12/16 22:35:25 christos Exp $");
 #include <sys/device.h>
 #include <sys/buf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc/dev/tctrl.c b/sys/arch/sparc/dev/tctrl.c
index d4290c12ffdd..9b491595f427 100644
--- a/sys/arch/sparc/dev/tctrl.c
+++ b/sys/arch/sparc/dev/tctrl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tctrl.c,v 1.51 2011/06/20 16:33:42 pgoyette Exp $	*/
+/*	$NetBSD: tctrl.c,v 1.52 2011/07/01 18:50:41 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.51 2011/06/20 16:33:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.52 2011/07/01 18:50:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.51 2011/06/20 16:33:42 pgoyette Exp $");
 
 #include <machine/apmvar.h>
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/tctrl.h>
 
diff --git a/sys/arch/sparc/dev/ts102.c b/sys/arch/sparc/dev/ts102.c
index 5fcd8cc69b63..e83a90ec78d5 100644
--- a/sys/arch/sparc/dev/ts102.c
+++ b/sys/arch/sparc/dev/ts102.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $	*/
-/*	$NetBSD: ts102.c,v 1.14 2009/09/17 16:28:12 tsutsui Exp $ */
+/*	$NetBSD: ts102.c,v 1.15 2011/07/01 18:50:42 dyoung Exp $ */
 /*
  * Copyright (c) 2003, 2004, Miodrag Vallat.
  * Copyright (c) 2005, Michael Lorenz.
@@ -77,7 +77,7 @@
 #include <dev/pcmcia/pcmciavar.h>
 #include <dev/pcmcia/pcmciachip.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc/dev/vme_machdep.c b/sys/arch/sparc/dev/vme_machdep.c
index c92c9a215050..c94fd46761a9 100644
--- a/sys/arch/sparc/dev/vme_machdep.c
+++ b/sys/arch/sparc/dev/vme_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_machdep.c,v 1.63 2011/01/14 02:06:31 rmind Exp $	*/
+/*	$NetBSD: vme_machdep.c,v 1.64 2011/07/01 18:50:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.63 2011/01/14 02:06:31 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.64 2011/07/01 18:50:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/extent.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.63 2011/01/14 02:06:31 rmind Exp $
 #include <uvm/uvm_extern.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sparc/sparc/iommuvar.h>
 #include <machine/autoconf.h>
 #include <machine/oldmon.h>
diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c
index 3f5494e306b0..9de005e64468 100644
--- a/sys/arch/sparc/sparc/clock.c
+++ b/sys/arch/sparc/sparc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $ */
+/*	$NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $");
 #include <sys/systm.h>
 #include <sys/timetc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/sparc/sparc/cpuunit.c b/sys/arch/sparc/sparc/cpuunit.c
index 14655a0a66eb..5426198ea453 100644
--- a/sys/arch/sparc/sparc/cpuunit.c
+++ b/sys/arch/sparc/sparc/cpuunit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $");
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <sparc/sparc/cpuunitvar.h>
 
diff --git a/sys/arch/sparc/sparc/eeprom.c b/sys/arch/sparc/sparc/eeprom.c
index ff90a1847939..900a73ce99d9 100644
--- a/sys/arch/sparc/sparc/eeprom.c
+++ b/sys/arch/sparc/sparc/eeprom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $ */
+/*	$NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $");
 #include <sys/device.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 
diff --git a/sys/arch/sparc/sparc/genassym.cf b/sys/arch/sparc/sparc/genassym.cf
index 85b2fdd991ed..cadcb6052cc9 100644
--- a/sys/arch/sparc/sparc/genassym.cf
+++ b/sys/arch/sparc/sparc/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.65 2011/02/20 10:02:01 mrg Exp $
+#	$NetBSD: genassym.cf,v 1.66 2011/07/01 18:51:51 dyoung Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@ include <sparc/dev/zsreg.h>
 include <sparc/dev/zsvar.h>
 endif
 
-include <machine/bus.h>
+include <sys/bus.h>
 include <sparc/dev/audioamdvar.h>
 
 include <sparc/dev/fdreg.h>
diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c
index 6b4d7c7341fd..e119fcb646b7 100644
--- a/sys/arch/sparc/sparc/iommu.c
+++ b/sys/arch/sparc/sparc/iommu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $ */
+/*	$NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $");
 #include <uvm/uvm.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/ctlreg.h>
 #include <sparc/sparc/asm.h>
diff --git a/sys/arch/sparc/sparc/memecc.c b/sys/arch/sparc/sparc/memecc.c
index c15ab462adfb..1e3919c8ea8a 100644
--- a/sys/arch/sparc/sparc/memecc.c
+++ b/sys/arch/sparc/sparc/memecc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: memecc.c,v 1.11 2008/12/16 22:35:26 christos Exp $	*/
+/*	$NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,13 +34,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.11 2008/12/16 22:35:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <sparc/sparc/memeccreg.h>
 
diff --git a/sys/arch/sparc/sparc/mkclock.c b/sys/arch/sparc/sparc/mkclock.c
index 8655cd99641b..91782ebddd10 100644
--- a/sys/arch/sparc/sparc/mkclock.c
+++ b/sys/arch/sparc/sparc/mkclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkclock.c,v 1.18 2008/04/28 20:23:36 martin Exp $ */
+/*	$NetBSD: mkclock.c,v 1.19 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.18 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.19 2011/07/01 18:51:51 dyoung Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.18 2008/04/28 20:23:36 martin Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 #include <machine/promlib.h>
diff --git a/sys/arch/sparc/sparc/msiiep.c b/sys/arch/sparc/sparc/msiiep.c
index 6954f19d6291..12403171a0d2 100644
--- a/sys/arch/sparc/sparc/msiiep.c
+++ b/sys/arch/sparc/sparc/msiiep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msiiep.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $ */
+/*	$NetBSD: msiiep.c,v 1.41 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.41 2011/07/01 18:51:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $");
 #include <uvm/uvm.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/promlib.h>
 
diff --git a/sys/arch/sparc/sparc/oclock.c b/sys/arch/sparc/sparc/oclock.c
index 2b3be05d3c82..a21acb1f8cf1 100644
--- a/sys/arch/sparc/sparc/oclock.c
+++ b/sys/arch/sparc/sparc/oclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: oclock.c,v 1.19 2010/01/03 23:03:21 mrg Exp $ */
+/*	$NetBSD: oclock.c,v 1.20 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.19 2010/01/03 23:03:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.20 2011/07/01 18:51:51 dyoung Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.19 2010/01/03 23:03:21 mrg Exp $");
 #include <sys/device.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/promlib.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc/sparc/pci_machdep.c b/sys/arch/sparc/sparc/pci_machdep.c
index 91b58ccdb838..652368da7e02 100644
--- a/sys/arch/sparc/sparc/pci_machdep.c
+++ b/sys/arch/sparc/sparc/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.15 2011/04/04 20:37:54 dyoung Exp $ */
+/*	$NetBSD: pci_machdep.c,v 1.16 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.15 2011/04/04 20:37:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2011/07/01 18:51:51 dyoung Exp $");
 
 #if defined(DEBUG) && !defined(SPARC_PCI_DEBUG)
 #define SPARC_PCI_DEBUG
@@ -64,7 +64,7 @@ int sparc_pci_debug = 0;
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <machine/ctlreg.h>
diff --git a/sys/arch/sparc/sparc/timer.c b/sys/arch/sparc/sparc/timer.c
index 9698896b0ae7..388df972eb85 100644
--- a/sys/arch/sparc/sparc/timer.c
+++ b/sys/arch/sparc/sparc/timer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $ */
+/*	$NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $");
 #include <sys/timetc.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <sparc/sparc/timerreg.h>
 #include <sparc/sparc/timervar.h>
diff --git a/sys/arch/sparc/sparc/timer_sun4.c b/sys/arch/sparc/sparc/timer_sun4.c
index 85ce302ffb8a..a48c95b7bad1 100644
--- a/sys/arch/sparc/sparc/timer_sun4.c
+++ b/sys/arch/sparc/sparc/timer_sun4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer_sun4.c,v 1.17 2010/01/04 03:54:42 mrg Exp $	*/
+/*	$NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.17 2010/01/04 03:54:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.17 2010/01/04 03:54:42 mrg Exp $");
 #include <sys/systm.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/timerreg.h>
diff --git a/sys/arch/sparc64/dev/com_ebus.c b/sys/arch/sparc64/dev/com_ebus.c
index 812d8d405542..276d4b305a70 100644
--- a/sys/arch/sparc64/dev/com_ebus.c
+++ b/sys/arch/sparc64/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $	*/
+/*	$NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.33 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $");
 #include <sys/tty.h>
 #include <sys/conf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c
index 6c51a43cbd57..55893008be90 100644
--- a/sys/arch/sparc64/dev/ebus.c
+++ b/sys/arch/sparc64/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $	*/
+/*	$NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.58 2011/07/01 18:48:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -64,7 +64,7 @@ int ebus_debug = 0x0;
 #include <sys/time.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/dev/ebus_mainbus.c b/sys/arch/sparc64/dev/ebus_mainbus.c
index 5461534897c4..6b8dee063a4a 100644
--- a/sys/arch/sparc64/dev/ebus_mainbus.c
+++ b/sys/arch/sparc64/dev/ebus_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus_mainbus.c,v 1.4 2011/06/02 00:24:23 christos Exp $	*/
+/*	$NetBSD: ebus_mainbus.c,v 1.5 2011/07/01 18:48:36 dyoung Exp $	*/
 /*	$OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ extern int ebus_debug;
 #include <sys/time.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/dev/ebusvar.h b/sys/arch/sparc64/dev/ebusvar.h
index 912c45ec0a40..0ff42107ebcd 100644
--- a/sys/arch/sparc64/dev/ebusvar.h
+++ b/sys/arch/sparc64/dev/ebusvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebusvar.h,v 1.10 2011/06/02 00:24:23 christos Exp $	*/
+/*	$NetBSD: ebusvar.h,v 1.11 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -36,7 +36,7 @@
 #include <sys/time.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/sparc64/dev/ffb.c b/sys/arch/sparc64/dev/ffb.c
index 169fe4d0e9c4..2d61d8077be9 100644
--- a/sys/arch/sparc64/dev/ffb.c
+++ b/sys/arch/sparc64/dev/ffb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.43 2011/06/03 03:20:39 christos Exp $	*/
+/*	$NetBSD: ffb.c,v 1.44 2011/07/01 18:48:36 dyoung Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.43 2011/06/03 03:20:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.44 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.43 2011/06/03 03:20:39 christos Exp $");
 #include <sys/malloc.h>
 #include <sys/mman.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <machine/vmparam.h>
diff --git a/sys/arch/sparc64/dev/ffb_mainbus.c b/sys/arch/sparc64/dev/ffb_mainbus.c
index cdd6ae3ad2ca..18acdecec2ed 100644
--- a/sys/arch/sparc64/dev/ffb_mainbus.c
+++ b/sys/arch/sparc64/dev/ffb_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb_mainbus.c,v 1.10 2011/06/03 03:20:39 christos Exp $	*/
+/*	$NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $	*/
 /*	$OpenBSD: creator_mainbus.c,v 1.4 2002/07/26 16:39:04 jason Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.10 2011/06/03 03:20:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.11 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.c,v 1.10 2011/06/03 03:20:39 christos Ex
 #include <sys/kernel.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/dev/gfb.c b/sys/arch/sparc64/dev/gfb.c
index d24422ca469a..e0b49a7869ef 100644
--- a/sys/arch/sparc64/dev/gfb.c
+++ b/sys/arch/sparc64/dev/gfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gfb.c,v 1.3 2010/08/31 03:08:23 macallan Exp $	*/
+/*	$NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.3 2010/08/31 03:08:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.3 2010/08/31 03:08:23 macallan Exp $");
 
 #include <dev/videomode/videomode.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 158fdb227b62..ef04d72a487a 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iommu.c,v 1.103 2011/03/20 21:26:36 mrg Exp $	*/
+/*	$NetBSD: iommu.c,v 1.104 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.103 2011/03/20 21:26:36 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.104 2011/07/01 18:48:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.103 2011/03/20 21:26:36 mrg Exp $");
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sparc64/dev/iommureg.h>
 #include <sparc64/dev/iommuvar.h>
 
diff --git a/sys/arch/sparc64/dev/lpt_ebus.c b/sys/arch/sparc64/dev/lpt_ebus.c
index fe56c82ed9d0..c649e36f6aeb 100644
--- a/sys/arch/sparc64/dev/lpt_ebus.c
+++ b/sys/arch/sparc64/dev/lpt_ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_ebus.c,v 1.22 2008/05/29 14:51:26 mrg Exp $	*/
+/*	$NetBSD: lpt_ebus.c,v 1.23 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v 1.22 2008/05/29 14:51:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v 1.23 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v 1.22 2008/05/29 14:51:26 mrg Exp $");
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ebus/ebusreg.h>
 #include <dev/ebus/ebusvar.h>
diff --git a/sys/arch/sparc64/dev/mkclock.c b/sys/arch/sparc64/dev/mkclock.c
index 4be92318b0a6..e0c9a0bb42ea 100644
--- a/sys/arch/sparc64/dev/mkclock.c
+++ b/sys/arch/sparc64/dev/mkclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $ */
+/*	$NetBSD: mkclock.c,v 1.8 2011/07/01 18:48:36 dyoung Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.8 2011/07/01 18:48:36 dyoung Exp $");
 
 /*    
  * Clock driver for 'mkclock' - Mostek MK48Txx TOD clock.
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.7 2011/03/12 11:42:57 nakayama Exp $")
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/sparc64/dev/pcfiic_ebus.c b/sys/arch/sparc64/dev/pcfiic_ebus.c
index 1a45e8421ddf..70bab7e7f7de 100644
--- a/sys/arch/sparc64/dev/pcfiic_ebus.c
+++ b/sys/arch/sparc64/dev/pcfiic_ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcfiic_ebus.c,v 1.1 2010/02/28 11:49:44 martin Exp $	*/
+/*	$NetBSD: pcfiic_ebus.c,v 1.2 2011/07/01 18:48:36 dyoung Exp $	*/
 /*	$OpenBSD: pcfiic_ebus.c,v 1.13 2008/06/08 03:07:40 deraadt Exp $ */
 
 /*
@@ -29,7 +29,7 @@
 #include <sys/kernel.h>
 #include <sys/rwlock.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/openfirm.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index 296796990f7c..596b14105ff1 100644
--- a/sys/arch/sparc64/dev/pci_machdep.c
+++ b/sys/arch/sparc64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.72 2011/05/11 22:26:46 macallan Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.73 2011/07/01 18:48:36 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.72 2011/05/11 22:26:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.73 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.72 2011/05/11 22:26:46 macallan Ex
 #include <sys/malloc.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/sparc64/dev/psm.c b/sys/arch/sparc64/dev/psm.c
index dafbf3fb8dd7..087c1ae35389 100644
--- a/sys/arch/sparc64/dev/psm.c
+++ b/sys/arch/sparc64/dev/psm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: psm.c,v 1.8 2011/06/03 03:09:02 christos Exp $ */
+/* $NetBSD: psm.c,v 1.9 2011/07/01 18:48:36 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
  * time with APM at this point, and some of sysmon seems "lacking".
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.8 2011/06/03 03:09:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.9 2011/07/01 18:48:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.8 2011/06/03 03:09:02 christos Exp $");
 #include <sys/kauth.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/ebus/ebusreg.h>
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 318968f57000..730e5ae875dd 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: psycho.c,v 1.107 2011/06/02 00:24:23 christos Exp $	*/
+/*	$NetBSD: psycho.c,v 1.108 2011/07/01 18:48:37 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.107 2011/06/02 00:24:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.108 2011/07/01 18:48:37 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -88,7 +88,7 @@ int psycho_debug = 0x0;
 #include <uvm/uvm.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/psl.h>
 
diff --git a/sys/arch/sparc64/dev/pyro.c b/sys/arch/sparc64/dev/pyro.c
index 7a10a48410d0..307ecbc8c757 100644
--- a/sys/arch/sparc64/dev/pyro.c
+++ b/sys/arch/sparc64/dev/pyro.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pyro.c,v 1.7 2011/06/03 03:02:36 christos Exp $	*/
+/*	$NetBSD: pyro.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $	*/
 /*	from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #include <sys/systm.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #ifdef DDB
diff --git a/sys/arch/sparc64/dev/rtc.c b/sys/arch/sparc64/dev/rtc.c
index 8f9d4631bc2d..04f62dc50857 100644
--- a/sys/arch/sparc64/dev/rtc.c
+++ b/sys/arch/sparc64/dev/rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $	*/
+/*	$NetBSD: rtc.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $");
 
 /*
  * Clock driver for 'rtc' - mc146818 driver.
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $");
 #include <sys/device.h>
 #include <sys/proc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <dev/clock_subr.h>
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 976d258b7a28..40bc53ee94cc 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbus.c,v 1.87 2011/03/16 05:49:43 mrg Exp $ */
+/*	$NetBSD: sbus.c,v 1.88 2011/07/01 18:48:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.87 2011/03/16 05:49:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.88 2011/07/01 18:48:37 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.87 2011/03/16 05:49:43 mrg Exp $");
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/openfirm.h>
 
 #include <sparc64/dev/iommureg.h>
diff --git a/sys/arch/sparc64/dev/sbusvar.h b/sys/arch/sparc64/dev/sbusvar.h
index fa44bd585012..188f314a79e8 100644
--- a/sys/arch/sparc64/dev/sbusvar.h
+++ b/sys/arch/sparc64/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbusvar.h,v 1.17 2009/09/17 16:28:12 tsutsui Exp $ */
+/*	$NetBSD: sbusvar.h,v 1.18 2011/07/01 18:48:37 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 #ifndef _SBUS_VAR_SPARC64_H_
 #define _SBUS_VAR_SPARC64_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * Macro to convert a PROM virtual address to a bus_space_handle_t.
diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c
index adf69da47cf6..c557a4df7e8a 100644
--- a/sys/arch/sparc64/dev/schizo.c
+++ b/sys/arch/sparc64/dev/schizo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: schizo.c,v 1.22 2011/06/03 03:02:12 christos Exp $	*/
+/*	$NetBSD: schizo.c,v 1.23 2011/07/01 18:48:37 dyoung Exp $	*/
 /*	$OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #include <sys/reboot.h>
 
 #define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/psl.h>
 
diff --git a/sys/arch/sparc64/dev/upa.c b/sys/arch/sparc64/dev/upa.c
index 1a32101941bc..8585ac0ab4d4 100644
--- a/sys/arch/sparc64/dev/upa.c
+++ b/sys/arch/sparc64/dev/upa.c
@@ -39,7 +39,7 @@
 #include <sys/conf.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index f0461a6752ad..b26b918a8f02 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $ */
+/*	$NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <machine/sparc64.h>
diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index 609c179605b0..3f4493bfc50a 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $ */
+/*	$NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $")
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/eeprom.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/sparc64/sparc64/core_machdep.c b/sys/arch/sparc64/sparc64/core_machdep.c
index faa14bb0b746..f330a5588ec7 100644
--- a/sys/arch/sparc64/sparc64/core_machdep.c
+++ b/sys/arch/sparc64/sparc64/core_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $ */
+/*	$NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * cpu_coredump is called to write a core dump header.
diff --git a/sys/arch/sparc64/sparc64/rbus_machdep.c b/sys/arch/sparc64/sparc64/rbus_machdep.c
index d76b8b15dba1..8f24c71f27c3 100644
--- a/sys/arch/sparc64/sparc64/rbus_machdep.c
+++ b/sys/arch/sparc64/sparc64/rbus_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2003 Takeshi Nakayama.
@@ -26,14 +26,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/openfirm.h>
 #include <machine/promlib.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index 882ac3ae681e..496d9ebd9030 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.97 2011/07/01 18:49:24 dyoung Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.97 2011/07/01 18:49:24 dyoung Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $"
 #include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * Map a user I/O request into kernel virtual address space.