Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:30:22 UTC 2011
Modified Files:
src/sys/arch/arm/marvell: mvsoc_dma.c mvsoc_space.c mvsocrtc.c
mvsocvar.h
src/sys/arch/arm/mpcore: dic.c mpcore_a2x_space.c mpcore_a4x_space.c
mpcore_clock.c mpcore_pmr.c mpcore_space.c
src/sys/arch/arm/omap: obio_com.c obio_mputmr.c obio_ohci.c obio_wdt.c
omap2430_intr.c omap2_gpio.c omap2_gpmc.c omap2_icu.c omap2_l3i.c
omap2_mputmr.c omap2_nand.c omap2_obio.c omap2_prcm.c
omap5912_intr.c omap_a2x_space.c omap_a4x_space.c omap_com.c
omap_dma.c omap_emifs.c omap_gpio.c omap_intr.c omap_mputmr.c
omap_nobyteacc_space.c omap_ocp.c omap_rtc.c omap_space.c
omap_tipb.c omap_var.h omap_wdt.c omap_wdtvar.h omapfb.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/mvsoc_dma.c \
src/sys/arch/arm/marvell/mvsoc_space.c \
src/sys/arch/arm/marvell/mvsocrtc.c src/sys/arch/arm/marvell/mvsocvar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/mpcore/dic.c \
src/sys/arch/arm/mpcore/mpcore_a2x_space.c \
src/sys/arch/arm/mpcore/mpcore_a4x_space.c \
src/sys/arch/arm/mpcore/mpcore_clock.c \
src/sys/arch/arm/mpcore/mpcore_pmr.c \
src/sys/arch/arm/mpcore/mpcore_space.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/obio_com.c \
src/sys/arch/arm/omap/omap2_mputmr.c src/sys/arch/arm/omap/omap2_nand.c \
src/sys/arch/arm/omap/omap_com.c src/sys/arch/arm/omap/omap_space.c \
src/sys/arch/arm/omap/omap_wdtvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/obio_mputmr.c \
src/sys/arch/arm/omap/obio_ohci.c src/sys/arch/arm/omap/obio_wdt.c \
src/sys/arch/arm/omap/omap5912_intr.c src/sys/arch/arm/omap/omap_emifs.c \
src/sys/arch/arm/omap/omap_ocp.c src/sys/arch/arm/omap/omap_rtc.c \
src/sys/arch/arm/omap/omap_tipb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2430_intr.c \
src/sys/arch/arm/omap/omap2_l3i.c src/sys/arch/arm/omap/omap_gpio.c \
src/sys/arch/arm/omap/omap_mputmr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap2_gpio.c \
src/sys/arch/arm/omap/omap2_icu.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/omap2_gpmc.c \
src/sys/arch/arm/omap/omap_intr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap2_obio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omap2_prcm.c \
src/sys/arch/arm/omap/omap_a2x_space.c \
src/sys/arch/arm/omap/omap_a4x_space.c \
src/sys/arch/arm/omap/omap_nobyteacc_space.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap_dma.c \
src/sys/arch/arm/omap/omap_var.h src/sys/arch/arm/omap/omap_wdt.c \
src/sys/arch/arm/omap/omapfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/mvsoc_dma.c
diff -u src/sys/arch/arm/marvell/mvsoc_dma.c:1.1 src/sys/arch/arm/marvell/mvsoc_dma.c:1.2
--- src/sys/arch/arm/marvell/mvsoc_dma.c:1.1 Sun Oct 3 05:49:24 2010
+++ src/sys/arch/arm/marvell/mvsoc_dma.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <sys/systm.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocvar.h>
Index: src/sys/arch/arm/marvell/mvsoc_space.c
diff -u src/sys/arch/arm/marvell/mvsoc_space.c:1.1 src/sys/arch/arm/marvell/mvsoc_space.c:1.2
--- src/sys/arch/arm/marvell/mvsoc_space.c:1.1 Sun Oct 3 05:49:24 2010
+++ src/sys/arch/arm/marvell/mvsoc_space.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocreg.h>
#include <arm/marvell/mvsocvar.h>
Index: src/sys/arch/arm/marvell/mvsocrtc.c
diff -u src/sys/arch/arm/marvell/mvsocrtc.c:1.1 src/sys/arch/arm/marvell/mvsocrtc.c:1.2
--- src/sys/arch/arm/marvell/mvsocrtc.c:1.1 Sat Mar 5 14:50:56 2011
+++ src/sys/arch/arm/marvell/mvsocrtc.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocrtcreg.h>
#include <dev/marvell/marvellvar.h>
Index: src/sys/arch/arm/marvell/mvsocvar.h
diff -u src/sys/arch/arm/marvell/mvsocvar.h:1.1 src/sys/arch/arm/marvell/mvsocvar.h:1.2
--- src/sys/arch/arm/marvell/mvsocvar.h:1.1 Sun Oct 3 05:49:24 2010
+++ src/sys/arch/arm/marvell/mvsocvar.h Fri Jul 1 20:30:21 2011
@@ -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;
Index: src/sys/arch/arm/mpcore/dic.c
diff -u src/sys/arch/arm/mpcore/dic.c:1.1 src/sys/arch/arm/mpcore/dic.c:1.2
--- src/sys/arch/arm/mpcore/dic.c:1.1 Fri Mar 11 03:26:37 2011
+++ src/sys/arch/arm/mpcore/dic.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/mpcore/mpcore_a2x_space.c
diff -u src/sys/arch/arm/mpcore/mpcore_a2x_space.c:1.1 src/sys/arch/arm/mpcore/mpcore_a2x_space.c:1.2
--- src/sys/arch/arm/mpcore/mpcore_a2x_space.c:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/mpcore_a2x_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/mpcore/mpcore_a4x_space.c
diff -u src/sys/arch/arm/mpcore/mpcore_a4x_space.c:1.1 src/sys/arch/arm/mpcore/mpcore_a4x_space.c:1.2
--- src/sys/arch/arm/mpcore/mpcore_a4x_space.c:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/mpcore_a4x_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/mpcore/mpcore_clock.c
diff -u src/sys/arch/arm/mpcore/mpcore_clock.c:1.1 src/sys/arch/arm/mpcore/mpcore_clock.c:1.2
--- src/sys/arch/arm/mpcore/mpcore_clock.c:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/mpcore_clock.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/mpcore/mpcore_pmr.c
diff -u src/sys/arch/arm/mpcore/mpcore_pmr.c:1.1 src/sys/arch/arm/mpcore/mpcore_pmr.c:1.2
--- src/sys/arch/arm/mpcore/mpcore_pmr.c:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/mpcore_pmr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/mpcore/mpcore_space.c
diff -u src/sys/arch/arm/mpcore/mpcore_space.c:1.1 src/sys/arch/arm/mpcore/mpcore_space.c:1.2
--- src/sys/arch/arm/mpcore/mpcore_space.c:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/mpcore_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/omap/obio_com.c
diff -u src/sys/arch/arm/omap/obio_com.c:1.3 src/sys/arch/arm/omap/obio_com.c:1.4
--- src/sys/arch/arm/omap/obio_com.c:1.3 Wed Aug 27 11:03:10 2008
+++ src/sys/arch/arm/omap/obio_com.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap2_mputmr.c
diff -u src/sys/arch/arm/omap/omap2_mputmr.c:1.3 src/sys/arch/arm/omap/omap2_mputmr.c:1.4
--- src/sys/arch/arm/omap/omap2_mputmr.c:1.3 Sat Jun 19 19:44:58 2010
+++ src/sys/arch/arm/omap/omap2_mputmr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap_gptmrreg.h>
Index: src/sys/arch/arm/omap/omap2_nand.c
diff -u src/sys/arch/arm/omap/omap2_nand.c:1.3 src/sys/arch/arm/omap/omap2_nand.c:1.4
--- src/sys/arch/arm/omap/omap2_nand.c:1.3 Tue Jun 28 07:16:53 2011
+++ src/sys/arch/arm/omap/omap2_nand.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_com.c
diff -u src/sys/arch/arm/omap/omap_com.c:1.3 src/sys/arch/arm/omap/omap_com.c:1.4
--- src/sys/arch/arm/omap/omap_com.c:1.3 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap_com.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_space.c
diff -u src/sys/arch/arm/omap/omap_space.c:1.3 src/sys/arch/arm/omap/omap_space.c:1.4
--- src/sys/arch/arm/omap/omap_space.c:1.3 Sat Nov 7 07:27:41 2009
+++ src/sys/arch/arm/omap/omap_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/omap/omap_wdtvar.h
diff -u src/sys/arch/arm/omap/omap_wdtvar.h:1.3 src/sys/arch/arm/omap/omap_wdtvar.h:1.4
--- src/sys/arch/arm/omap/omap_wdtvar.h:1.3 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap_wdtvar.h Fri Jul 1 20:30:21 2011
@@ -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 */
Index: src/sys/arch/arm/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.4 src/sys/arch/arm/omap/obio_mputmr.c:1.5
--- src/sys/arch/arm/omap/obio_mputmr.c:1.4 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/obio_mputmr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap2_obiovar.h>
Index: src/sys/arch/arm/omap/obio_ohci.c
diff -u src/sys/arch/arm/omap/obio_ohci.c:1.4 src/sys/arch/arm/omap/obio_ohci.c:1.5
--- src/sys/arch/arm/omap/obio_ohci.c:1.4 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/obio_ohci.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/obio_wdt.c
diff -u src/sys/arch/arm/omap/obio_wdt.c:1.4 src/sys/arch/arm/omap/obio_wdt.c:1.5
--- src/sys/arch/arm/omap/obio_wdt.c:1.4 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/obio_wdt.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap5912_intr.c
diff -u src/sys/arch/arm/omap/omap5912_intr.c:1.4 src/sys/arch/arm/omap/omap5912_intr.c:1.5
--- src/sys/arch/arm/omap/omap5912_intr.c:1.4 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/omap/omap5912_intr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/lock.h>
Index: src/sys/arch/arm/omap/omap_emifs.c
diff -u src/sys/arch/arm/omap/omap_emifs.c:1.4 src/sys/arch/arm/omap/omap_emifs.c:1.5
--- src/sys/arch/arm/omap/omap_emifs.c:1.4 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/omap_emifs.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_ocp.c
diff -u src/sys/arch/arm/omap/omap_ocp.c:1.4 src/sys/arch/arm/omap/omap_ocp.c:1.5
--- src/sys/arch/arm/omap/omap_ocp.c:1.4 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/omap_ocp.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_rtc.c
diff -u src/sys/arch/arm/omap/omap_rtc.c:1.4 src/sys/arch/arm/omap/omap_rtc.c:1.5
--- src/sys/arch/arm/omap/omap_rtc.c:1.4 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/omap_rtc.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_tipb.c
diff -u src/sys/arch/arm/omap/omap_tipb.c:1.4 src/sys/arch/arm/omap/omap_tipb.c:1.5
--- src/sys/arch/arm/omap/omap_tipb.c:1.4 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/omap_tipb.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap2430_intr.c
diff -u src/sys/arch/arm/omap/omap2430_intr.c:1.5 src/sys/arch/arm/omap/omap2430_intr.c:1.6
--- src/sys/arch/arm/omap/omap2430_intr.c:1.5 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/omap/omap2430_intr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <arm/cpufunc.h>
#include <arm/omap/omap2_reg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef OMAP_2430
#define NIGROUPS 8
Index: src/sys/arch/arm/omap/omap2_l3i.c
diff -u src/sys/arch/arm/omap/omap2_l3i.c:1.5 src/sys/arch/arm/omap/omap2_l3i.c:1.6
--- src/sys/arch/arm/omap/omap2_l3i.c:1.5 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap2_l3i.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_gpio.c
diff -u src/sys/arch/arm/omap/omap_gpio.c:1.5 src/sys/arch/arm/omap/omap_gpio.c:1.6
--- src/sys/arch/arm/omap/omap_gpio.c:1.5 Wed Dec 17 20:51:32 2008
+++ src/sys/arch/arm/omap/omap_gpio.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_mputmr.c
diff -u src/sys/arch/arm/omap/omap_mputmr.c:1.5 src/sys/arch/arm/omap/omap_mputmr.c:1.6
--- src/sys/arch/arm/omap/omap_mputmr.c:1.5 Fri Dec 12 17:36:14 2008
+++ src/sys/arch/arm/omap/omap_mputmr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap_reg.h>
Index: src/sys/arch/arm/omap/omap2_gpio.c
diff -u src/sys/arch/arm/omap/omap2_gpio.c:1.7 src/sys/arch/arm/omap/omap2_gpio.c:1.8
--- src/sys/arch/arm/omap/omap2_gpio.c:1.7 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap2_gpio.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap2_icu.c
diff -u src/sys/arch/arm/omap/omap2_icu.c:1.7 src/sys/arch/arm/omap/omap2_icu.c:1.8
--- src/sys/arch/arm/omap/omap2_icu.c:1.7 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/omap/omap2_icu.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap2_gpmc.c
diff -u src/sys/arch/arm/omap/omap2_gpmc.c:1.8 src/sys/arch/arm/omap/omap2_gpmc.c:1.9
--- src/sys/arch/arm/omap/omap2_gpmc.c:1.8 Sat Sep 4 16:23:47 2010
+++ src/sys/arch/arm/omap/omap2_gpmc.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap_intr.c
diff -u src/sys/arch/arm/omap/omap_intr.c:1.8 src/sys/arch/arm/omap/omap_intr.c:1.9
--- src/sys/arch/arm/omap/omap_intr.c:1.8 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/omap/omap_intr.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/lock.h>
Index: src/sys/arch/arm/omap/omap2_obio.c
diff -u src/sys/arch/arm/omap/omap2_obio.c:1.11 src/sys/arch/arm/omap/omap2_obio.c:1.12
--- src/sys/arch/arm/omap/omap2_obio.c:1.11 Sat Sep 4 14:22:28 2010
+++ src/sys/arch/arm/omap/omap2_obio.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
Index: src/sys/arch/arm/omap/omap2_prcm.c
diff -u src/sys/arch/arm/omap/omap2_prcm.c:1.1 src/sys/arch/arm/omap/omap2_prcm.c:1.2
--- src/sys/arch/arm/omap/omap2_prcm.c:1.1 Sat Aug 28 13:02:32 2010
+++ src/sys/arch/arm/omap/omap2_prcm.c Fri Jul 1 20:30:21 2011
@@ -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>
Index: src/sys/arch/arm/omap/omap_a2x_space.c
diff -u src/sys/arch/arm/omap/omap_a2x_space.c:1.1 src/sys/arch/arm/omap/omap_a2x_space.c:1.2
--- src/sys/arch/arm/omap/omap_a2x_space.c:1.1 Sat Jan 6 00:29:52 2007
+++ src/sys/arch/arm/omap/omap_a2x_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/omap/omap_a4x_space.c
diff -u src/sys/arch/arm/omap/omap_a4x_space.c:1.1 src/sys/arch/arm/omap/omap_a4x_space.c:1.2
--- src/sys/arch/arm/omap/omap_a4x_space.c:1.1 Sat Jan 6 00:29:52 2007
+++ src/sys/arch/arm/omap/omap_a4x_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/omap/omap_nobyteacc_space.c
diff -u src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.1 src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.2
--- src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.1 Sat Jan 6 00:29:52 2007
+++ src/sys/arch/arm/omap/omap_nobyteacc_space.c Fri Jul 1 20:30:21 2011
@@ -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);
Index: src/sys/arch/arm/omap/omap_dma.c
diff -u src/sys/arch/arm/omap/omap_dma.c:1.2 src/sys/arch/arm/omap/omap_dma.c:1.3
--- src/sys/arch/arm/omap/omap_dma.c:1.2 Wed Jul 7 22:53:44 2010
+++ src/sys/arch/arm/omap/omap_dma.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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,
Index: src/sys/arch/arm/omap/omap_var.h
diff -u src/sys/arch/arm/omap/omap_var.h:1.2 src/sys/arch/arm/omap/omap_var.h:1.3
--- src/sys/arch/arm/omap/omap_var.h:1.2 Sun Apr 27 18:58:45 2008
+++ src/sys/arch/arm/omap/omap_var.h Fri Jul 1 20:30:21 2011
@@ -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 */
Index: src/sys/arch/arm/omap/omap_wdt.c
diff -u src/sys/arch/arm/omap/omap_wdt.c:1.2 src/sys/arch/arm/omap/omap_wdt.c:1.3
--- src/sys/arch/arm/omap/omap_wdt.c:1.2 Sun Apr 27 18:58:45 2008
+++ src/sys/arch/arm/omap/omap_wdt.c Fri Jul 1 20:30:21 2011
@@ -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>
Index: src/sys/arch/arm/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.2 src/sys/arch/arm/omap/omapfb.c:1.3
--- src/sys/arch/arm/omap/omapfb.c:1.2 Tue Apr 12 18:10:15 2011
+++ src/sys/arch/arm/omap/omapfb.c Fri Jul 1 20:30:21 2011
@@ -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 @@
#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>
