Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:41:17 UTC 2011
Modified Files:
src/sys/arch/evbarm/imx31: imx31lk_machdep.c imx31lk_pcic.c
src/sys/arch/evbarm/iq31244: iq31244_7seg.c iq31244_pci.c wdc_obio.c
src/sys/arch/evbarm/iq80310: com_obio.c i80312_mainbus.c iq80310_7seg.c
iq80310_intr.c iq80310_machdep.c iq80310_pci.c iq80310_timer.c
obio.c obio_space.c
src/sys/arch/evbarm/iq80321: com_obio.c i80321_mainbus.c iq80321_7seg.c
iq80321_machdep.c iq80321_pci.c obio.c obio_space.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx31/imx31lk_pcic.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq31244/iq31244_7seg.c \
src/sys/arch/evbarm/iq31244/iq31244_pci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/iq31244/wdc_obio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80310/com_obio.c \
src/sys/arch/evbarm/iq80310/i80312_mainbus.c \
src/sys/arch/evbarm/iq80310/obio_space.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/iq80310/iq80310_7seg.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/iq80310/iq80310_intr.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/iq80310/iq80310_pci.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/iq80310/iq80310_timer.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/iq80310/obio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/iq80321/com_obio.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/iq80321/i80321_mainbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/iq80321/iq80321_7seg.c \
src/sys/arch/evbarm/iq80321/iq80321_pci.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/iq80321/obio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/iq80321/obio_space.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/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.12 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.13
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.12 Thu Jun 30 20:09:24 2011
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -144,7 +144,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/imx31/imx31lk_pcic.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.3 src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.4
--- src/sys/arch/evbarm/imx31/imx31lk_pcic.c:1.3 Mon Jun 30 00:49:31 2008
+++ src/sys/arch/evbarm/imx31/imx31lk_pcic.c Fri Jul 1 20:41:16 2011
@@ -1,5 +1,5 @@
-/* $Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $ */
-/* $NetBSD: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $ */
+/* $Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $ */
+/* $NetBSD: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $ */
/* $OpenBSD: pxapcic.c,v 1.1 2005/07/01 23:51:55 uwe Exp $ */
/*
@@ -19,14 +19,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $");
+__KERNEL_RCSID(0, "$Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
Index: src/sys/arch/evbarm/iq31244/iq31244_7seg.c
diff -u src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.4 src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.5
--- src/sys/arch/evbarm/iq31244/iq31244_7seg.c:1.4 Sat Dec 24 20:06:59 2005
+++ src/sys/arch/evbarm/iq31244/iq31244_7seg.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $ */
+/* $NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/iq31244/iq31244_pci.c
diff -u src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.4 src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.5
--- src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.4 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/iq31244/iq31244_pci.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq31244_pci.c,v 1.4 2011/04/04 20:37:48 dyoung Exp $ */
+/* $NetBSD: iq31244_pci.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.4 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/iq31244/wdc_obio.c
diff -u src/sys/arch/evbarm/iq31244/wdc_obio.c:1.5 src/sys/arch/evbarm/iq31244/wdc_obio.c:1.6
--- src/sys/arch/evbarm/iq31244/wdc_obio.c:1.5 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/evbarm/iq31244/wdc_obio.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.6 2011/07/01 20:41:16 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2005 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.6 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/xscale/i80321var.h>
Index: src/sys/arch/evbarm/iq80310/com_obio.c
diff -u src/sys/arch/evbarm/iq80310/com_obio.c:1.13 src/sys/arch/evbarm/iq80310/com_obio.c:1.14
--- src/sys/arch/evbarm/iq80310/com_obio.c:1.13 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/evbarm/iq80310/com_obio.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.13 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.13 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310var.h>
#include <evbarm/iq80310/obiovar.h>
Index: src/sys/arch/evbarm/iq80310/i80312_mainbus.c
diff -u src/sys/arch/evbarm/iq80310/i80312_mainbus.c:1.13 src/sys/arch/evbarm/iq80310/i80312_mainbus.c:1.14
--- src/sys/arch/evbarm/iq80310/i80312_mainbus.c:1.13 Sun Dec 11 12:17:09 2005
+++ src/sys/arch/evbarm/iq80310/i80312_mainbus.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i80312_mainbus.c,v 1.13 2005/12/11 12:17:09 christos Exp $ */
+/* $NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.13 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: src/sys/arch/evbarm/iq80310/obio_space.c
diff -u src/sys/arch/evbarm/iq80310/obio_space.c:1.13 src/sys/arch/evbarm/iq80310/obio_space.c:1.14
--- src/sys/arch/evbarm/iq80310/obio_space.c:1.13 Sat Nov 7 07:27:42 2009
+++ src/sys/arch/evbarm/iq80310/obio_space.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.13 2009/11/07 07:27:42 cegger Exp $ */
+/* $NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.13 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 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(obio);
Index: src/sys/arch/evbarm/iq80310/iq80310_7seg.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_7seg.c:1.9 src/sys/arch/evbarm/iq80310/iq80310_7seg.c:1.10
--- src/sys/arch/evbarm/iq80310/iq80310_7seg.c:1.9 Sun Dec 11 12:17:09 2005
+++ src/sys/arch/evbarm/iq80310/iq80310_7seg.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_7seg.c,v 1.9 2005/12/11 12:17:09 christos Exp $ */
+/* $NetBSD: iq80310_7seg.c,v 1.10 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_7seg.c,v 1.9 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_7seg.c,v 1.10 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: src/sys/arch/evbarm/iq80310/iq80310_intr.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.28 src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.29
--- src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.28 Mon Jan 31 23:56:14 2011
+++ src/sys/arch/evbarm/iq80310/iq80310_intr.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.28 2011/01/31 23:56:14 jakllsch Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.28 2011/01/31 23:56:14 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -50,7 +50,7 @@
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.79 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.80
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.79 Thu Jun 30 20:09:25 2011
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.79 2011/06/30 20:09:25 wiz Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.80 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.79 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.80 2011/07/01 20:41:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -98,7 +98,7 @@
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/iq80310/iq80310_pci.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.10 src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.11
--- src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.10 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/iq80310/iq80310_pci.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_pci.c,v 1.10 2011/04/04 20:37:48 dyoung Exp $ */
+/* $NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.10 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: src/sys/arch/evbarm/iq80310/iq80310_timer.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.21 src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.22
--- src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.21 Sun Jan 20 16:28:24 2008
+++ src/sys/arch/evbarm/iq80310/iq80310_timer.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_timer.c,v 1.21 2008/01/20 16:28:24 joerg Exp $ */
+/* $NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.21 2008/01/20 16:28:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <evbarm/iq80310/iq80310reg.h>
Index: src/sys/arch/evbarm/iq80310/obio.c
diff -u src/sys/arch/evbarm/iq80310/obio.c:1.19 src/sys/arch/evbarm/iq80310/obio.c:1.20
--- src/sys/arch/evbarm/iq80310/obio.c:1.19 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/evbarm/iq80310/obio.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: obio.c,v 1.20 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -44,14 +44,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: src/sys/arch/evbarm/iq80321/com_obio.c
diff -u src/sys/arch/evbarm/iq80321/com_obio.c:1.12 src/sys/arch/evbarm/iq80321/com_obio.c:1.13
--- src/sys/arch/evbarm/iq80321/com_obio.c:1.12 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbarm/iq80321/com_obio.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.12 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.12 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: src/sys/arch/evbarm/iq80321/i80321_mainbus.c
diff -u src/sys/arch/evbarm/iq80321/i80321_mainbus.c:1.16 src/sys/arch/evbarm/iq80321/i80321_mainbus.c:1.17
--- src/sys/arch/evbarm/iq80321/i80321_mainbus.c:1.16 Thu Dec 15 01:44:00 2005
+++ src/sys/arch/evbarm/iq80321/i80321_mainbus.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_mainbus.c,v 1.16 2005/12/15 01:44:00 briggs Exp $ */
+/* $NetBSD: i80321_mainbus.c,v 1.17 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.16 2005/12/15 01:44:00 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.17 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/iq80321/iq80321_7seg.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_7seg.c:1.6 src/sys/arch/evbarm/iq80321/iq80321_7seg.c:1.7
--- src/sys/arch/evbarm/iq80321/iq80321_7seg.c:1.6 Sat Dec 24 20:06:59 2005
+++ src/sys/arch/evbarm/iq80321/iq80321_7seg.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_7seg.c,v 1.6 2005/12/24 20:06:59 perry Exp $ */
+/* $NetBSD: iq80321_7seg.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_7seg.c,v 1.6 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_7seg.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/iq80321/iq80321_pci.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.6 src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.7
--- src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.6 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/iq80321/iq80321_pci.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_pci.c,v 1.6 2011/04/04 20:37:48 dyoung Exp $ */
+/* $NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.6 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.49 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.50
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.49 Thu Jun 30 20:09:25 2011
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.49 2011/06/30 20:09:25 wiz Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.50 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.49 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.50 2011/07/01 20:41:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -99,7 +99,7 @@
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/iq80321/obio.c
diff -u src/sys/arch/evbarm/iq80321/obio.c:1.15 src/sys/arch/evbarm/iq80321/obio.c:1.16
--- src/sys/arch/evbarm/iq80321/obio.c:1.15 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/evbarm/iq80321/obio.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: obio.c,v 1.16 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16 2011/07/01 20:41:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
Index: src/sys/arch/evbarm/iq80321/obio_space.c
diff -u src/sys/arch/evbarm/iq80321/obio_space.c:1.10 src/sys/arch/evbarm/iq80321/obio_space.c:1.11
--- src/sys/arch/evbarm/iq80321/obio_space.c:1.10 Sat Nov 7 07:27:42 2009
+++ src/sys/arch/evbarm/iq80321/obio_space.c Fri Jul 1 20:41:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.10 2009/11/07 07:27:42 cegger Exp $ */
+/* $NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.10 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 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(obio);
