#include <sys/bus.h> instead of <machine/bus.h>.

sys/arch/arm/imx/imx31_ahb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $	*/
+/*	$NetBSD: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $");
 
 #include "locators.h"
 #include "avic.h"
@@ -112,7 +112,7 @@ __KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/imx/imx31_aips.c

@@ -1,7 +1,7 @@
-/*	$Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $	*/
+/*	$Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /* derived from:	*/
-/*	$NetBSD: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
+/*	$NetBSD: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $");
 
 #include "locators.h"
 
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/imx/imx31_clock.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx31_clock.c,v 1.2 2010/11/15 18:19:19 bsh Exp $ */
+/*	$NetBSD: imx31_clock.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2009,2010  Genetec corp.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec corp.
@@ -37,7 +37,7 @@
 #include <sys/device.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpu.h>
 #include <arm/armreg.h>

sys/arch/arm/imx/imx31_gpio.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx31_gpio.c,v 1.5 2010/11/15 18:18:39 bsh Exp $	*/
+/*	$NetBSD: imx31_gpio.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.5 2010/11/15 18:18:39 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $");
 
 #define _INTR_PRIVATE
 
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.5 2010/11/15 18:18:39 bsh Exp $");
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/imx/imx31reg.h>
 #include <arm/imx/imx31var.h>

sys/arch/arm/imx/imx31_icu.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx31_icu.c,v 1.5 2008/11/19 06:28:14 matt Exp $	*/
+/*	$NetBSD: imx31_icu.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.5 2008/11/19 06:28:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $");
 
 #define _INTR_PRIVATE
  
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.5 2008/11/19 06:28:14 matt Exp $");
 #include <arm/cpufunc.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/imx/imx31reg.h>
 #include <arm/imx/imx31var.h>

sys/arch/arm/imx/imx51_clock.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_clock.c,v 1.1 2010/11/13 06:51:37 bsh Exp $ */
+/*	$NetBSD: imx51_clock.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2009  Genetec corp.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec corp.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_clock.c,v 1.1 2010/11/13 06:51:37 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_clock.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_clock.c,v 1.1 2010/11/13 06:51:37 bsh Exp $");
 #include <dev/clock_subr.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 

sys/arch/arm/imx/imx51_gpio.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_gpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $ */
+/*	$NetBSD: imx51_gpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
 
 /* derived from imx31_gpio.c */
 /*-
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
 
 #include "locators.h"
 #include "gpio.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/imx/imx51reg.h>
 #include <arm/imx/imx51var.h>

sys/arch/arm/imx/imx51_iomux.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_iomux.c,v 1.1 2010/11/30 13:05:27 bsh Exp $	*/
+/*	$NetBSD: imx51_iomux.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010  Genetec Corporation.  All rights reserved.
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_iomux.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_iomux.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
 
 #define	_INTR_PRIVATE
 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_iomux.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/imx/imx51reg.h>
 #include <arm/imx/imx51var.h>

sys/arch/arm/imx/imx51_tzic.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_tzic.c,v 1.2 2010/12/20 00:25:28 matt Exp $	*/
+/*	$NetBSD: imx51_tzic.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo@nerv.org>
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.2 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $");
 
 #define	_INTR_PRIVATE	/* for arm/pic/picvar.h */
 
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.2 2010/12/20 00:25:28 matt Exp $");
 #include <sys/atomic.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 

sys/arch/arm/imx/imx_dma.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imx_dma.c,v 1.1 2010/11/13 07:11:03 bsh Exp $ */
+/*	$NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2009  Genetec Corporation.  All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.1 2010/11/13 07:11:03 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.1 2010/11/13 07:11:03 bsh Exp $");
 #include <uvm/uvm_extern.h>
 
 #define	_ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct arm32_bus_dma_tag imx_bus_dma_tag = {
 	0,

sys/arch/arm/imx/imx_pcic.c

@@ -1,4 +1,4 @@
-/*	$Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $	*/
+/*	$Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /*
  * IMX CF interface to pcic/pcmcia
@@ -6,7 +6,7 @@
  * Sun Apr  1 21:42:37 PDT 2007
  */
 
-/*	$NetBSD: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $	*/
+/*	$NetBSD: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $	*/
 /*	$OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $	*/
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $");
+__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $");
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
         
 #include <dev/pcmcia/pcmciareg.h>

sys/arch/arm/imx/imx_space.c

@@ -1,7 +1,7 @@
-/* $Id: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
+/* $Id: imx_space.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
 
 /* derived from: */
-/*	$NetBSD: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
+/*	$NetBSD: imx_space.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 bs_protos(imx);
 bs_protos(generic);

sys/arch/arm/imx/imxclock.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imxclock.c,v 1.3 2010/11/13 06:51:37 bsh Exp $ */
+/*	$NetBSD: imxclock.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2009, 2010  Genetec corp.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec corp.
@@ -41,7 +41,7 @@
 #include <sys/device.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpu.h>
 #include <arm/armreg.h>

sys/arch/arm/imx/imxgpio.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: imxgpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $ */
+/*	$NetBSD: imxgpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
 
 #define	_INTR_PRIVATE
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/imx/imx31reg.h>
 #include <arm/imx/imx31var.h>

sys/arch/arm/iomd/console/consinit.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.7 2006/08/16 07:59:44 he Exp $ */
+/*	$NetBSD: consinit.c,v 1.8 2011/07/01 20:26:36 dyoung Exp $ */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2006/08/16 07:59:44 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 20:26:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2006/08/16 07:59:44 he Exp $");
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 

sys/arch/arm/iomd/iomd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $	*/
+/*	$NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1996-1997 Mark Brinicombe.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $");
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 #include <arm/iomd/iomdreg.h>

sys/arch/arm/iomd/iomd_io.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $	*/
+/*	$NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -38,11 +38,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Proto types for all the bus_space structure functions */
 

sys/arch/arm/iomd/iomdkbc.c

@@ -1,4 +1,4 @@
-/* $NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $ */
+/* $NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2004 Ben Harris
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $");
 
 #include <dev/pckbport/pckbportvar.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arch/arm/iomd/iomdreg.h>

sys/arch/arm/iomd/iomdvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: iomdvar.h,v 1.2 2002/04/19 01:04:39 wiz Exp $	*/
+/*	$NetBSD: iomdvar.h,v 1.3 2011/07/01 20:26:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -39,7 +39,7 @@
  * Created      : 02/02/97
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * Attach args for iomd_clock device

sys/arch/arm/iomd/qms.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $	*/
+/*	$NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 Reinoud Zandijk
@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $");
 
 #include <sys/callout.h>
 #include <sys/device.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $");
 #include <sys/systm.h>
 #include <sys/select.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/iomd/iomdvar.h>

sys/arch/arm/iomd/vidc20.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc20.c,v 1.15 2006/08/05 18:22:57 bjh21 Exp $	*/
+/*	$NetBSD: vidc20.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.15 2006/08/05 18:22:57 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.16 2011/07/01 20:26:35 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 <arm/iomd/vidc.h>
 #include <machine/io.h>
 #include <arm/iomd/iomdreg.h>

sys/arch/arm/iomd/vidcvideo.c

@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Reinoud Zandijk
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $");
 #include <sys/ioctl.h>
 
 #include <arm/mainbus/mainbus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/wscons/wsconsio.h>

sys/arch/arm/ixp12x0/ixp12x0.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0.c,v 1.17 2011/05/17 17:34:48 dyoung Exp $ */
+/*	$NetBSD: ixp12x0.c,v 1.18 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,14 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v 1.17 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v 1.18 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0reg.h>
 #include <arm/ixp12x0/ixp12x0var.h>

sys/arch/arm/ixp12x0/ixp12x0_clk.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0_clk.c,v 1.14 2008/05/10 15:31:04 martin Exp $	*/
+/*	$NetBSD: ixp12x0_clk.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.14 2008/05/10 15:31:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.14 2008/05/10 15:31:04 martin Exp
 #include <sys/timetc.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/ixp12x0/ixp12x0_com.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0_com.c,v 1.38 2011/04/24 16:26:54 rmind Exp $ */
+/*	$NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.38 2011/04/24 16:26:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.38 2011/04/24 16:26:54 rmind Exp $
 #include <sys/lwp.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0_comreg.h>
 #include <arm/ixp12x0/ixp12x0_comvar.h>

sys/arch/arm/ixp12x0/ixp12x0_intr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.21 2010/12/20 00:25:28 matt Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.21 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $");
 
 /*
  * Interrupt support for the Intel ixp12x0
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.21 2010/12/20 00:25:28 matt Exp $
 #include <sys/simplelock.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/ixp12x0/ixp12x0_io.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0_io.c,v 1.14 2009/11/07 07:27:41 cegger Exp $ */
+/*	$NetBSD: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.14 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $");
 
 /*
  * bus_space I/O functions for ixp12x0
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.14 2009/11/07 07:27:41 cegger Exp $
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0reg.h>
 #include <arm/ixp12x0/ixp12x0var.h>

sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $ */
+/*	$NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Ex
 #include <uvm/uvm_extern.h>
 
 #define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0_pcireg.h>
 #include <arm/ixp12x0/ixp12x0var.h>

sys/arch/arm/ixp12x0/ixp12x0var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0var.h,v 1.8 2009/10/21 14:15:50 rmind Exp $ */
+/*	$NetBSD: ixp12x0var.h,v 1.9 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2002
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -33,7 +33,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 

sys/arch/arm/ixp12x0/ixpsip.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $ */
+/*	$NetBSD: ixpsip.c,v 1.13 2011/07/01 20:27:50 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.13 2011/07/01 20:27:50 dyoung Exp $");
 
 /*
  * Slow peripheral bus of ixp12x0 Processor
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $");
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0var.h>
 #include <arm/ixp12x0/ixpsipvar.h>

sys/arch/arm/ixp12x0/ixpsipvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ixpsipvar.h,v 1.2 2009/10/21 14:15:50 rmind Exp $ */
+/*	$NetBSD: ixpsipvar.h,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
 /*
  * Copyright (c) 2002
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -33,7 +33,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct ixpsip_softc {
 	struct device sc_dev;

sys/arch/arm/mainbus/mainbus.c

@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $");
 #if defined(arm32)		/* XXX */
 #include <machine/io.h>
 #endif
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/mainbus/mainbus.h>
 #include "locators.h"
 

sys/arch/arm/mainbus/mainbus.h

@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.1 2001/02/24 19:38:02 reinoud Exp $ */
+/* $NetBSD: mainbus.h,v 1.2 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -41,7 +41,7 @@
  * Created      : 15/12/94
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * mainbus driver attach arguments

sys/arch/arm/mainbus/mainbus_io.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $	*/
+/*	$NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.20 2009/11/07 07:27:41 cegger Exp $
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pmap.h>
 
 /* Proto types for all the bus_space structure functions */

sys/arch/arm/marvell/mvsoc_dma.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsoc_dma.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $ */
+/*	$NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $
 #include <sys/systm.h>
 #include <sys/extent.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/marvell/mvsocvar.h>
 

sys/arch/arm/marvell/mvsoc_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsoc_space.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $	*/
+/*	$NetBSD: mvsoc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $	*/
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_mvsoc.h"
 #include "mvpex.h"
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsoc_space.c,v 1.1 2010/10/03 05:49:24 kiyohara Exp
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/marvell/mvsocreg.h>
 #include <arm/marvell/mvsocvar.h>

sys/arch/arm/marvell/mvsocrtc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsocrtc.c,v 1.1 2011/03/05 14:50:56 matt Exp $	*/
+/*	$NetBSD: mvsocrtc.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsocrtc.c,v 1.1 2011/03/05 14:50:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsocrtc.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsocrtc.c,v 1.1 2011/03/05 14:50:56 matt Exp $");
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/marvell/mvsocrtcreg.h>
 #include <dev/marvell/marvellvar.h>

sys/arch/arm/marvell/mvsocvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsocvar.h,v 1.1 2010/10/03 05:49:24 kiyohara Exp $	*/
+/*	$NetBSD: mvsocvar.h,v 1.2 2011/07/01 20:30:21 dyoung Exp $	*/
 /*
  * Copyright (c) 2007, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -28,7 +28,7 @@
 #ifndef _MVSOCVAR_H_
 #define _MVSOCVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct mvsoc_softc {
         device_t sc_dev;

sys/arch/arm/mpcore/dic.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dic.c,v 1.1 2011/03/11 03:26:37 bsh Exp $ */
+/*	$NetBSD: dic.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2010, 2011 Genetec Corporation.  All rights reserved.
@@ -28,7 +28,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dic.c,v 1.1 2011/03/11 03:26:37 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dic.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #define	_INTR_PRIVATE	/* for arm/pic/picvar.h */
 
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: dic.c,v 1.1 2011/03/11 03:26:37 bsh Exp $");
 #include <sys/atomic.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 

sys/arch/arm/mpcore/mpcore_a2x_space.c

@@ -35,14 +35,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_a2x_space.c,v 1.1 2011/03/10 07:47:15 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_a2x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(mpcore);

sys/arch/arm/mpcore/mpcore_a4x_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mpcore_a4x_space.c,v 1.1 2011/03/10 07:47:15 bsh Exp $ */
+/*	$NetBSD: mpcore_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /* derived from:
    NetBSD: pxa2x0_a4x_space.c,v 1.4 2006/07/28 08:15:29 simonb Exp */
@@ -35,14 +35,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_a4x_space.c,v 1.1 2011/03/10 07:47:15 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(mpcore);

sys/arch/arm/mpcore/mpcore_clock.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mpcore_clock.c,v 1.1 2011/03/10 07:47:15 bsh Exp $ */
+/*	$NetBSD: mpcore_clock.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011  Genetec corp.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec corp.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_clock.c,v 1.1 2011/03/10 07:47:15 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_clock.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_clock.c,v 1.1 2011/03/10 07:47:15 bsh Exp $")
 #include <dev/clock_subr.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpu.h>
 #include <arm/armreg.h>

sys/arch/arm/mpcore/mpcore_pmr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mpcore_pmr.c,v 1.1 2011/03/10 07:47:15 bsh Exp $ */
+/*	$NetBSD: mpcore_pmr.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2010, 2011 Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c,v 1.1 2011/03/10 07:47:15 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c,v 1.1 2011/03/10 07:47:15 bsh Exp $");
 #include <sys/atomic.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 

sys/arch/arm/mpcore/mpcore_space.c

@@ -1,4 +1,4 @@
-/* $NetBSD: mpcore_space.c,v 1.1 2011/03/10 07:47:15 bsh Exp $ */
+/* $NetBSD: mpcore_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /* derived from: */
 /* NetBSD: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp */
@@ -80,7 +80,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 bs_protos(mpcore);
 bs_protos(generic);

sys/arch/arm/omap/obio_com.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_com.c,v 1.3 2008/08/27 11:03:10 matt Exp $	*/
+/*	$NetBSD: obio_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Based on arch/arm/omap/omap_com.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.3 2008/08/27 11:03:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_omap.h"
 #include "opt_com.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_com.c,v 1.3 2008/08/27 11:03:10 matt Exp $");
 #include <sys/termios.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>

sys/arch/arm/omap/obio_mputmr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Based on omap_mputmr.c
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_omap.h"
 #include "opt_cpuoptions.h"
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $")
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/omap/omap2_obiovar.h>

sys/arch/arm/omap/obio_ohci.c

@@ -1,7 +1,7 @@
-/*	$Id: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
+/*	$Id: obio_ohci.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
+/*	$NetBSD: obio_ohci.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $	*/
 /*	$OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/kernel.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>

sys/arch/arm/omap/obio_wdt.c

@@ -33,7 +33,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.4 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.4 2008/11/21 17:13:07 matt Exp $");
 #include <sys/wdog.h>
 
 #include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/sysmon/sysmonvar.h>
 
 #include <arm/omap/omap2_obiovar.h>

sys/arch/arm/omap/omap2430_intr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2430_intr.c,v 1.5 2010/12/20 00:25:29 matt Exp $	*/
+/*	$NetBSD: omap2430_intr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $	*/
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -35,7 +35,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2430_intr.c,v 1.5 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2430_intr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2430_intr.c,v 1.5 2010/12/20 00:25:29 matt Exp $
 #include <arm/cpufunc.h>
 #include <arm/omap/omap2_reg.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #ifdef OMAP_2430
 #define	NIGROUPS	8

sys/arch/arm/omap/omap2_gpio.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_gpio.c,v 1.7 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap2_gpio.c,v 1.8 2011/07/01 20:30:21 dyoung Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c,v 1.7 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c,v 1.8 2011/07/01 20:30:21 dyoung Exp $");
 
 #define _INTR_PRIVATE
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c,v 1.7 2008/11/21 17:13:07 matt Exp $");
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap2_obiovar.h>

sys/arch/arm/omap/omap2_gpmc.c

@@ -1,7 +1,7 @@
-/*	$Id: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $	*/
+/*	$Id: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $ */
+/*	$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $ */
 
 
 /*
@@ -102,7 +102,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.8 2010/09/04 16:23:47 ahoka Exp $")
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap2_icu.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_icu.c,v 1.7 2010/12/20 00:25:29 matt Exp $	*/
+/*	$NetBSD: omap2_icu.c,v 1.8 2011/07/01 20:30:21 dyoung Exp $	*/
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,7 +30,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.7 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.8 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.7 2010/12/20 00:25:29 matt Exp $");
 #include <uvm/uvm_extern.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpu.h>
 #include <arm/armreg.h>

sys/arch/arm/omap/omap2_l3i.c

@@ -1,7 +1,7 @@
-/*	$Id: omap2_l3i.c,v 1.5 2008/11/21 17:13:07 matt Exp $	*/
+/*	$Id: omap2_l3i.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_l3i.c,v 1.5 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap2_l3i.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,v 1.5 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,v 1.5 2008/11/21 17:13:07 matt Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap2_mputmr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_mputmr.c,v 1.3 2010/06/19 19:44:58 matt Exp $	*/
+/*	$NetBSD: omap2_mputmr.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * OMAP 2430 GP timers
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_mputmr.c,v 1.3 2010/06/19 19:44:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_mputmr.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_omap.h"
 #include "opt_cpuoptions.h"
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_mputmr.c,v 1.3 2010/06/19 19:44:58 matt Exp $"
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/omap/omap_gptmrreg.h>

sys/arch/arm/omap/omap2_nand.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_nand.c,v 1.3 2011/06/28 07:16:53 ahoka Exp $	*/
+/*	$NetBSD: omap2_nand.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.3 2011/06/28 07:16:53 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_omap.h"
 #include "opt_flash.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.3 2011/06/28 07:16:53 ahoka Exp $")
 #include <sys/cdefs.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arch/arm/omap/omap2_gpmcvar.h>
 #include <arch/arm/omap/omap2_gpmcreg.h>

sys/arch/arm/omap/omap2_obio.c

@@ -1,7 +1,7 @@
-/*	$Id: omap2_obio.c,v 1.11 2010/09/04 14:22:28 kiyohara Exp $	*/
+/*	$Id: omap2_obio.c,v 1.12 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_obio.c,v 1.11 2010/09/04 14:22:28 kiyohara Exp $ */
+/*	$NetBSD: omap2_obio.c,v 1.12 2011/07/01 20:30:21 dyoung Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.11 2010/09/04 14:22:28 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.12 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.11 2010/09/04 14:22:28 kiyohara Exp
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap2_prcm.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_prcm.c,v 1.1 2010/08/28 13:02:32 ahoka Exp $	*/
+/*	$NetBSD: omap2_prcm.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2010 Adam Hoka
@@ -28,12 +28,12 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.1 2010/08/28 13:02:32 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/omap/omap_var.h>
 

sys/arch/arm/omap/omap5912_intr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap5912_intr.c,v 1.4 2010/12/20 00:25:29 matt Exp $	*/
+/*	$NetBSD: omap5912_intr.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * IRQ data specific to the Texas Instruments OMAP5912 processor.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap5912_intr.c,v 1.4 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap5912_intr.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap5912_intr.c,v 1.4 2010/12/20 00:25:29 matt Exp $
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/lock.h>
 

sys/arch/arm/omap/omap_a2x_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_a2x_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $ */
+/*	$NetBSD: omap_a2x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Based on arch/arm/xscale/pxa2x0_a4x_space.c
@@ -41,14 +41,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_a2x_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_a2x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(omap);

sys/arch/arm/omap/omap_a4x_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_a4x_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $ */
+/*	$NetBSD: omap_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Based on arch/arm/xscale/pxa2x0_a4x_space.c
@@ -41,14 +41,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_a4x_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(omap);

sys/arch/arm/omap/omap_com.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_com.c,v 1.3 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Based on arch/arm/xscale/pxa2x0_com.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_com.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_com.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "opt_com.h"
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_com.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
 #include <sys/termios.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>

sys/arch/arm/omap/omap_dma.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_dma.c,v 1.2 2010/07/07 22:53:44 macallan Exp $	*/
+/*	$NetBSD: omap_dma.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2010 Michael Lorenz
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.2 2010/07/07 22:53:44 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.2 2010/07/07 22:53:44 macallan Exp $"
 #include <uvm/uvm_extern.h>
 
 #define	_ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct arm32_bus_dma_tag omap_bus_dma_tag = {
 	0,

sys/arch/arm/omap/omap_emifs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
+/*	$NetBSD: omap_emifs.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $ */
 
 
 /*
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap_gpio.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_gpio.c,v 1.5 2008/12/17 20:51:32 cegger Exp $ */
+/*	$NetBSD: omap_gpio.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * The OMAP GPIO Controller interface is inspired by pxa2x0_gpio.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.5 2008/12/17 20:51:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.5 2008/12/17 20:51:32 cegger Exp $")
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/omap/omap_tipb.h>
 #include <arm/omap/omap_gpio.h>

sys/arch/arm/omap/omap_intr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_intr.c,v 1.8 2010/12/20 00:25:29 matt Exp $	*/
+/*	$NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Based on arch/arm/xscale/pxa2x0_intr.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.8 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.8 2010/12/20 00:25:29 matt Exp $");
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/lock.h>
 

sys/arch/arm/omap/omap_mputmr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $	*/
+/*	$NetBSD: omap_mputmr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Based on i80321_timer.c and arch/arm/sa11x0/sa11x0_ost.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $")
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/omap/omap_reg.h>

sys/arch/arm/omap/omap_nobyteacc_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_nobyteacc_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $ */
+/*	$NetBSD: omap_nobyteacc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * "nobyteacc" bus_space functions for Texas Instruments OMAP processor.
@@ -73,14 +73,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_nobyteacc_space.c,v 1.1 2007/01/06 00:29:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_nobyteacc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(omap);

sys/arch/arm/omap/omap_ocp.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
+/*	$NetBSD: omap_ocp.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP OCP bus.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -107,7 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap_rtc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
+/*	$NetBSD: omap_rtc.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * OMAP RTC driver, based on i80321_timer.c.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/device.h>
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/omap/omap_reg.h>

sys/arch/arm/omap/omap_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_space.c,v 1.3 2009/11/07 07:27:41 cegger Exp $ */
+/*	$NetBSD: omap_space.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * bus_space functions for Texas Instruments OMAP processor.
@@ -73,14 +73,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.3 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(omap);

sys/arch/arm/omap/omap_tipb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
+/*	$NetBSD: omap_tipb.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP TIPB.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.5 2011/07/01 20:30:21 dyoung Exp $");
 
 #include "locators.h"
 
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/omap/omap_var.h

@@ -2,7 +2,7 @@
 #define _ARM_OMAP_OMAP_VAR_H_
 
 #include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Texas Instruments OMAP generic */
 

sys/arch/arm/omap/omap_wdt.c

@@ -40,7 +40,7 @@
 #include <sys/wdog.h>
 
 #include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/sysmon/sysmonvar.h>
 
 #include <arm/omap/omap_wdtvar.h>

sys/arch/arm/omap/omap_wdtvar.h

@@ -32,7 +32,7 @@
 #define  _OMAP_WDTVAR_H
 
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/sysmon/sysmonvar.h>
  
 #define	OMAPWDT32K_DEFAULT_PERIOD	4		/* in seconds */

sys/arch/arm/omap/omapfb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: omapfb.c,v 1.2 2011/04/12 18:10:15 ahoka Exp $	*/
+/*	$NetBSD: omapfb.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.2 2011/04/12 18:10:15 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.3 2011/07/01 20:30:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.2 2011/04/12 18:10:15 ahoka Exp $");
 
 #include <dev/videomode/videomode.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/omap/omapfbreg.h>
 #include <arm/omap/omap2_obiovar.h>
 #include <arm/omap/omap2_obioreg.h>

sys/arch/arm/s3c2xx0/ohci_s3c24x0.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $ */
+/*	$NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
 
 /* derived from ohci_pci.c */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp
 #include <sys/proc.h>
 #include <sys/queue.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/s3c2xx0/s3c24x0var.h>
 

sys/arch/arm/s3c2xx0/s3c2410.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2410.c,v 1.10 2005/12/11 12:16:51 christos Exp $ */
+/*	$NetBSD: s3c2410.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003, 2005  Genetec corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.10 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.10 2005/12/11 12:16:51 christos Exp $"
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/s3c2xx0/s3c2410_extint.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $ */
+/* $NetBSD: s3c2410_extint.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -39,13 +39,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.10 2010/01/05 13:14:56 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 

sys/arch/arm/s3c2xx0/s3c2410_intr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2410_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -35,13 +35,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/s3c2xx0/s3c2410_spi.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_spi.c,v 1.5 2009/03/14 15:36:02 dsl Exp $ */
+/* $NetBSD: s3c2410_spi.c,v 1.6 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -35,13 +35,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.5 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.6 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <arm/s3c2xx0/s3c24x0var.h>

sys/arch/arm/s3c2xx0/s3c24x0_clk.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c24x0_clk.c,v 1.10 2008/07/04 11:59:45 bsh Exp $ */
+/*	$NetBSD: s3c24x0_clk.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.10 2008/07/04 11:59:45 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.11 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.10 2008/07/04 11:59:45 bsh Exp $")
 #include <sys/time.h>
 #include <sys/timetc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 

sys/arch/arm/s3c2xx0/s3c24x0_lcd.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.7 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.6 2007/12/15 00:39:15 perry Exp $"
 #include <dev/rasops/rasops.h>
 #include <dev/wsfont/wsfont.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <arm/cpufunc.h>
 

sys/arch/arm/s3c2xx0/s3c24x0_lcd.h

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.h,v 1.4 2007/03/04 05:59:38 christos Exp $ */
+/* $NetBSD: s3c24x0_lcd.h,v 1.5 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -34,7 +34,7 @@
 #define	_ARM_S3C2XX0_S3C24X0_LCD_H
 
 #include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* LCD Contoroller */
 

sys/arch/arm/s3c2xx0/s3c2800.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2800.c,v 1.11 2005/12/11 12:16:51 christos Exp $ */
+/*	$NetBSD: s3c2800.c,v 1.12 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.11 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.12 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.11 2005/12/11 12:16:51 christos Exp $"
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>

sys/arch/arm/s3c2xx0/s3c2800_clk.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_clk.c,v 1.15 2009/03/18 10:22:24 cegger Exp $ */
+/* $NetBSD: s3c2800_clk.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.15 2009/03/18 10:22:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.15 2009/03/18 10:22:24 cegger Exp
 #include <sys/time.h>
 #include <sys/timetc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 

sys/arch/arm/s3c2xx0/s3c2800_intr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2800_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -38,13 +38,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_intr.c,v 1.12 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_intr.c,v 1.13 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/s3c2xx0/s3c2800_pci.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2800_pci.c,v 1.15 2011/05/17 17:34:48 dyoung Exp $	*/
+/*	$NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.15 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.16 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.15 2011/05/17 17:34:48 dyoung Exp
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/s3c2xx0/s3c2800reg.h>
 #include <arm/s3c2xx0/s3c2800var.h>

sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2xx0_busdma.c,v 1.3 2005/12/11 12:16:51 christos Exp $ */
+/*	$NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.3 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busdma.c,v 1.3 2005/12/11 12:16:51 christos
 #include <sys/extent.h>
 
 #define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/s3c2xx0/s3c2xx0var.h>
 

sys/arch/arm/s3c2xx0/s3c2xx0_intr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0_intr.c,v 1.14 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: s3c2xx0_intr.c,v 1.15 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -73,13 +73,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.14 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.15 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/s3c2xx0/s3c2xx0_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2xx0_space.c,v 1.8 2009/11/07 07:27:41 cegger Exp $ */
+/*	$NetBSD: s3c2xx0_space.c,v 1.9 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -74,14 +74,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_space.c,v 1.8 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_space.c,v 1.9 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(s3c2xx0);

sys/arch/arm/s3c2xx0/s3c2xx0var.h

@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0var.h,v 1.5 2010/11/16 02:53:02 bsh Exp $ */
+/* $NetBSD: s3c2xx0var.h,v 1.6 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -35,7 +35,7 @@
 #ifndef _ARM_S3C2XX0VAR_H_
 #define _ARM_S3C2XX0VAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 
 struct s3c2xx0_softc {

sys/arch/arm/s3c2xx0/sscom_s3c2410.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: sscom_s3c2410.c,v 1.3 2009/11/21 20:32:28 rmind Exp $ */
+/*	$NetBSD: sscom_s3c2410.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2410.c,v 1.3 2009/11/21 20:32:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2410.c,v 1.4 2011/07/01 20:31:39 dyoung Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: sscom_s3c2410.c,v 1.3 2009/11/21 20:32:28 rmind Exp
 #include <sys/vnode.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/s3c2xx0/s3c2410reg.h>
 #include <arm/s3c2xx0/s3c2410var.h>

sys/arch/arm/s3c2xx0/sscom_s3c2800.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: sscom_s3c2800.c,v 1.7 2009/11/21 20:32:28 rmind Exp $ */
+/*	$NetBSD: sscom_s3c2800.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2800.c,v 1.7 2009/11/21 20:32:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom_s3c2800.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: sscom_s3c2800.c,v 1.7 2009/11/21 20:32:28 rmind Exp
 #include <sys/vnode.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/s3c2xx0/s3c2800reg.h>
 #include <arm/s3c2xx0/s3c2800var.h>

sys/arch/arm/s3c2xx0/sscom_var.h

@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_var.h,v 1.7 2006/03/06 20:21:25 rjs Exp $ */
+/* $NetBSD: sscom_var.h,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -75,7 +75,7 @@
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #ifdef	SSCOM_S3C2410
 #include <arm/s3c2xx0/s3c2410reg.h>

sys/arch/arm/sa11x0/sa1111.c

@@ -1,4 +1,4 @@
-/*      $NetBSD: sa1111.c,v 1.23 2009/05/29 14:15:44 rjs Exp $	*/
+/*      $NetBSD: sa1111.c,v 1.24 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.23 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.24 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1.23 2009/05/29 14:15:44 rjs Exp $");
 #include <sys/malloc.h>
 #include <sys/uio.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/sa11x0/sa11x0_reg.h>

sys/arch/arm/sa11x0/sa11x0.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0.c,v 1.25 2009/08/09 06:12:33 kiyohara Exp $	*/
+/*	$NetBSD: sa11x0.c,v 1.26 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.25 2009/08/09 06:12:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.26 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.25 2009/08/09 06:12:33 kiyohara Exp $")
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/arm32/psl.h>
 #include <arm/arm32/machdep.h>

sys/arch/arm/sa11x0/sa11x0_com.c

@@ -1,4 +1,4 @@
-/*      $NetBSD: sa11x0_com.c,v 1.48 2011/04/24 16:26:54 rmind Exp $        */
+/*      $NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.48 2011/04/24 16:26:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.49 2011/07/01 20:31:39 dyoung Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.48 2011/04/24 16:26:54 rmind Exp $"
 
 #include <dev/cons.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/sa11x0/sa11x0_reg.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/sa11x0/sa11x0_comreg.h>

sys/arch/arm/sa11x0/sa11x0_io.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_io.c,v 1.18 2009/11/07 07:27:42 cegger Exp $	*/
+/*	$NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.18 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.19 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.18 2009/11/07 07:27:42 cegger Exp $"
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pmap.h>
 
 /* Prototypes for all the bus_space structure functions */

sys/arch/arm/sa11x0/sa11x0_ost.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_ost.c,v 1.28 2009/08/09 06:12:33 kiyohara Exp $	*/
+/*	$NetBSD: sa11x0_ost.c,v 1.29 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.28 2009/08/09 06:12:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.29 2011/07/01 20:31:39 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.28 2009/08/09 06:12:33 kiyohara Exp
 #include <sys/timetc.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>

sys/arch/arm/sa11x0/sa11x0_var.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_var.h,v 1.10 2009/08/09 06:12:33 kiyohara Exp $	*/
+/*	$NetBSD: sa11x0_var.h,v 1.11 2011/07/01 20:31:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct sa11x0_softc {
 	device_t sc_dev;