#include <sys/bus.h> instead of <machine/bus.h>. trunk
authordyoung <dyoung@NetBSD.org>
Fri, 01 Jul 2011 18:21:31 +0000
branchtrunk
changeset 202485 c385f4749c4d
parent 202484 0c9f1e05ae35
child 202486 c19639dae99e
#include <sys/bus.h> instead of <machine/bus.h>.
sys/arch/algor/algor/algor_p4032_dma.c
sys/arch/algor/algor/algor_p4032_intr.c
sys/arch/algor/algor/algor_p4032var.h
sys/arch/algor/algor/algor_p5064_dma.c
sys/arch/algor/algor/algor_p5064_intr.c
sys/arch/algor/algor/algor_p5064var.h
sys/arch/algor/algor/algor_p6032_dma.c
sys/arch/algor/algor/algor_p6032_intr.c
sys/arch/algor/algor/algor_p6032var.h
sys/arch/algor/algor/autoconf.c
sys/arch/algor/algor/bus_dma.c
sys/arch/algor/algor/machdep.c
sys/arch/algor/dev/bonito_mainbus.c
sys/arch/algor/dev/com_mainbus.c
sys/arch/algor/dev/lpt_mainbus.c
sys/arch/algor/dev/mainbus.c
sys/arch/algor/dev/mcclock_mainbus.c
sys/arch/algor/dev/vtpbc_mainbus.c
sys/arch/x86/acpi/acpi_machdep.c
sys/arch/x86/acpi/acpi_wakeup.c
sys/arch/x86/include/isa_machdep.h
sys/arch/x86/include/mpconfig.h
sys/arch/x86/pci/agp_machdep.c
sys/arch/x86/pci/amdpcib_hpet.c
sys/arch/x86/pci/fwhrng.c
sys/arch/x86/pci/ichlpcib.c
sys/arch/x86/pci/ichlpcib_hpet.c
sys/arch/x86/pci/pchb.c
sys/arch/x86/pci/pci_addr_fixup.c
sys/arch/x86/pci/pci_bus_fixup.c
sys/arch/x86/pci/pcib.c
sys/arch/x86/pci/rdcpcib.c
sys/arch/x86/x86/bus_dma.c
sys/arch/x86/x86/consinit.c
sys/arch/x86/x86/genfb_machdep.c
sys/arch/x86/x86/mp.c
sys/arch/x86/x86/mpacpi.c
--- a/sys/arch/algor/algor/algor_p4032_dma.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032_dma.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $	*/
+/*	$NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define	_ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <algor/algor/algor_p4032reg.h>
 #include <algor/algor/algor_p4032var.h>
--- a/sys/arch/algor/algor/algor_p4032_intr.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032_intr.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $	*/
+/*	$NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define	__INTR_PRIVATE
@@ -51,7 +51,7 @@
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
--- a/sys/arch/algor/algor/algor_p4032var.h	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032var.h	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $	*/
+/*	$NetBSD: algor_p4032var.h,v 1.7 2011/07/01 18:30: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>
 
 struct p4032_config {
--- a/sys/arch/algor/algor/algor_p5064_dma.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064_dma.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $	*/
+/*	$NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define	_ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <algor/algor/algor_p5064reg.h>
 #include <algor/algor/algor_p5064var.h>
--- a/sys/arch/algor/algor/algor_p5064_intr.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064_intr.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $	*/
+/*	$NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define	__INTR_PRIVATE
@@ -51,7 +51,7 @@
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
--- a/sys/arch/algor/algor/algor_p5064var.h	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064var.h	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p5064var.h,v 1.7 2011/02/20 07:51:21 matt Exp $	*/
+/*	$NetBSD: algor_p5064var.h,v 1.8 2011/07/01 18:30: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 <dev/isa/isavar.h>
 
--- a/sys/arch/algor/algor/algor_p6032_dma.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032_dma.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $	*/
+/*	$NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define	_ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <algor/algor/algor_p6032reg.h>
 #include <algor/algor/algor_p6032var.h>
--- a/sys/arch/algor/algor/algor_p6032_intr.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032_intr.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $	*/
+/*	$NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define	__INTR_PRIVATE
@@ -50,7 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
--- a/sys/arch/algor/algor/algor_p6032var.h	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032var.h	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor_p6032var.h,v 1.3 2011/03/05 14:04:02 matt Exp $	*/
+/*	$NetBSD: algor_p6032var.h,v 1.4 2011/07/01 18:30: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 <dev/isa/isavar.h>
 
--- a/sys/arch/algor/algor/autoconf.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/autoconf.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -47,7 +47,7 @@
 #include <net/if.h>
 #include <net/if_ether.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 
--- a/sys/arch/algor/algor/bus_dma.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/bus_dma.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,7 @@
 #include <mips/cache.h>
 
 #define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 
--- a/sys/arch/algor/algor/machdep.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/machdep.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h" 
@@ -107,7 +107,7 @@
 #include <ddb/db_extern.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pmon.h>
 #include <machine/pcb.h>
--- a/sys/arch/algor/dev/bonito_mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/bonito_mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 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.12 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $");
 
 #include "opt_algor_p6032.h"
 
@@ -40,7 +40,7 @@
 #include <sys/reboot.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <mips/bonito/bonitoreg.h>
--- a/sys/arch/algor/dev/com_mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/com_mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,7 @@
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
--- a/sys/arch/algor/dev/lpt_mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/lpt_mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $	*/
+/*	$NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/lptreg.h>
 #include <dev/ic/lptvar.h>
--- a/sys/arch/algor/dev/mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.23 2011/07/01 18:31:31 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2011/07/01 18:31:31 dyoung Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -46,7 +46,7 @@
 #include <sys/malloc.h>
 #include <sys/extent.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <mips/cache.h>
--- a/sys/arch/algor/dev/mcclock_mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/mcclock_mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $	*/
+/*	$NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -37,7 +37,7 @@
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
--- a/sys/arch/algor/dev/vtpbc_mainbus.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/vtpbc_mainbus.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $	*/
+/*	$NetBSD: vtpbc_mainbus.c,v 1.17 2011/07/01 18:31:31 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.17 2011/07/01 18:31:31 dyoung Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -41,7 +41,7 @@
 #include <sys/reboot.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <algor/pci/vtpbcvar.h>
--- a/sys/arch/x86/acpi/acpi_machdep.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/acpi/acpi_machdep.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,15 +40,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.1 2011/06/12 11:31:31 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <machine/cpufunc.h>
 
 #include <dev/acpi/acpica.h>
--- a/sys/arch/x86/acpi/acpi_wakeup.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $	*/
+/*	$NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.28 2011/02/16 18:55:50 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.29 2011/07/01 18:22:39 dyoung Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
@@ -64,7 +64,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
--- a/sys/arch/x86/include/isa_machdep.h	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/include/isa_machdep.h	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.10 2009/08/19 15:04:27 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.11 2011/07/01 18:22:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 #ifndef _X86_ISA_MACHDEP_H_			/* XXX */
 #define _X86_ISA_MACHDEP_H_			/* XXX */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 #include <dev/isa/isadmavar.h>
 
--- a/sys/arch/x86/include/mpconfig.h	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/include/mpconfig.h	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpconfig.h,v 1.12 2010/01/09 20:56:17 cegger Exp $	*/
+/*	$NetBSD: mpconfig.h,v 1.13 2011/07/01 18:22:39 dyoung Exp $	*/
 
 /*
  * Definitions originally from the mpbios code, but now used for ACPI
@@ -11,7 +11,7 @@
 /*
  * XXX
  */
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <machine/pci_machdep.h>
 
--- a/sys/arch/x86/pci/agp_machdep.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/agp_machdep.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,13 +1,13 @@
-/*	$NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $	*/
+/*	$NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $	*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
--- a/sys/arch/x86/pci/amdpcib_hpet.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/amdpcib_hpet.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $ */
+/* $NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $ */
 
 /*
  * Copyright (c) 2006 Nicolas Joly
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -37,7 +37,7 @@
 #include <sys/time.h>
 #include <sys/timetc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
--- a/sys/arch/x86/pci/fwhrng.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/fwhrng.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $	*/
+/*	$NetBSD: fwhrng.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $");
 
 #include "rnd.h"        
                             
@@ -43,7 +43,7 @@
 #include <sys/time.h>
 #include <sys/rnd.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arch/x86/pci/i82802reg.h>
 
--- a/sys/arch/x86/pci/ichlpcib.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/ichlpcib.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichlpcib.c,v 1.31 2011/06/15 06:43:20 jruoho Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.32 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.31 2011/06/15 06:43:20 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.32 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -48,7 +48,7 @@
 #include <sys/sysctl.h>
 #include <sys/timetc.h>
 #include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
--- a/sys/arch/x86/pci/ichlpcib_hpet.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/ichlpcib_hpet.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib_hpet.c,v 1.2 2011/06/15 08:19:43 jruoho Exp $ */
+/* $NetBSD: ichlpcib_hpet.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -29,15 +29,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib_hpet.c,v 1.2 2011/06/15 08:19:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib_hpet.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/param.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 
-#include <machine/bus.h>
-
 #include <dev/ic/hpetreg.h>
 #include <dev/ic/hpetvar.h>
 #include <dev/ic/i82801lpcreg.h>
--- a/sys/arch/x86/pci/pchb.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/pchb.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.25 2011/05/17 17:34:53 dyoung Exp $ */
+/*	$NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.25 2011/05/17 17:34:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 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>
--- a/sys/arch/x86/pci/pci_addr_fixup.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/pci_addr_fixup.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $	*/
+/*	$NetBSD: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,7 +36,7 @@
 #include <sys/device.h>
 #include <sys/extent.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
--- a/sys/arch/x86/pci/pci_bus_fixup.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/pci_bus_fixup.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $	*/
+/*	$NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999, by UCHIYAMA Yasushi
@@ -30,13 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
--- a/sys/arch/x86/pci/pcib.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/pcib.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.12 2010/04/28 19:17:04 dyoung Exp $	*/
+/*	$NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.12 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 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/isa/isavar.h>
 
--- a/sys/arch/x86/pci/rdcpcib.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/pci/rdcpcib.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $	*/
+/*	$NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2011 Manuel Bouyer.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -40,7 +40,7 @@
 #include <sys/sysctl.h>
 #include <sys/timetc.h>
 #include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
--- a/sys/arch/x86/x86/bus_dma.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/x86/bus_dma.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $");
 
 /*
  * The following is included because _bus_dma_uiomove is derived from
@@ -93,7 +93,7 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bus_private.h>
 #include <machine/i82093var.h>
 #include <machine/mpbiosvar.h>
--- a/sys/arch/x86/x86/consinit.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/x86/consinit.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $	*/
+/*	$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,14 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bootinfo.h>
 #include <arch/x86/include/genfb_machdep.h>
 
--- a/sys/arch/x86/x86/genfb_machdep.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/x86/genfb_machdep.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $");
 
 #include "opt_mtrr.h"
 
@@ -42,7 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/mtrr.h>
 
--- a/sys/arch/x86/x86/mp.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/x86/mp.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $	*/
+/*	$NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $");
 
 #include "opt_multiprocessor.h"
 #include "pchb.h"
@@ -50,7 +50,7 @@
 
 #include <machine/specialreg.h>
 #include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/mpconfig.h>
 
 #include <dev/pci/pcivar.h>
--- a/sys/arch/x86/x86/mpacpi.c	Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/x86/x86/mpacpi.c	Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $");
 
 #include "acpica.h"
 #include "opt_acpi.h"
@@ -55,7 +55,7 @@
 
 #include <machine/specialreg.h>
 #include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/mpacpi.h>
 #include <machine/mpbiosvar.h>