Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:25:42 UTC 2011
Modified Files:
src/sys/arch/arc/dev: opms.c pccons.c
src/sys/arch/arc/dti: arcsisabr.c tyneisabr.c
src/sys/arch/arc/isa: isadma_bounce.c isapnp_machdep.c mcclock_isa.c
opms_isa.c pccons_isa.c timer_isa.c
src/sys/arch/arc/jazz: asc.c bus_dma_jazz.c com_jazzio.c fd.c
fdc_jazzio.c if_sn_jazzio.c jazzdmatlb.c jazzio.c jazziovar.h
jazzisabr.c lpt_jazzio.c mcclock_jazzio.c oosiop_jazzio.c
opms_jazzio.c osiop_jazzio.c pccons_jazzio.c vga_jazzio.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/dev/opms.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arc/dev/pccons.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/dti/arcsisabr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/dti/tyneisabr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/isadma_bounce.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/isa/isapnp_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/isa/mcclock_isa.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/isa/opms_isa.c \
src/sys/arch/arc/isa/pccons_isa.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/isa/timer_isa.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arc/jazz/asc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/jazz/bus_dma_jazz.c \
src/sys/arch/arc/jazz/vga_jazzio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/jazz/com_jazzio.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/jazz/fdc_jazzio.c \
src/sys/arch/arc/jazz/jazzdmatlb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/jazz/if_sn_jazzio.c \
src/sys/arch/arc/jazz/jazzisabr.c src/sys/arch/arc/jazz/mcclock_jazzio.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arc/jazz/jazzio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/jazz/jazziovar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/jazz/lpt_jazzio.c \
src/sys/arch/arc/jazz/osiop_jazzio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arc/jazz/oosiop_jazzio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/jazz/opms_jazzio.c \
src/sys/arch/arc/jazz/pccons_jazzio.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/arc/dev/opms.c
diff -u src/sys/arch/arc/dev/opms.c:1.18 src/sys/arch/arc/dev/opms.c:1.19
--- src/sys/arch/arc/dev/opms.c:1.18 Fri Jun 13 08:27:38 2008
+++ src/sys/arch/arc/dev/opms.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $ */
+/* $NetBSD: opms.c,v 1.19 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.18 2008/06/13 08:27:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.19 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@
#include <sys/proc.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/kbdreg.h>
#include <machine/mouse.h>
Index: src/sys/arch/arc/dev/pccons.c
diff -u src/sys/arch/arc/dev/pccons.c:1.58 src/sys/arch/arc/dev/pccons.c:1.59
--- src/sys/arch/arc/dev/pccons.c:1.58 Sun Apr 24 16:26:53 2011
+++ src/sys/arch/arc/dev/pccons.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $ */
+/* $NetBSD: pccons.c,v 1.59 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.59 2011/07/01 19:25:41 dyoung Exp $");
#include "opt_ddb.h"
@@ -97,7 +97,7 @@
#include <sys/proc.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/pcdisplay.h>
#include <machine/pccons.h>
Index: src/sys/arch/arc/dti/arcsisabr.c
diff -u src/sys/arch/arc/dti/arcsisabr.c:1.4 src/sys/arch/arc/dti/arcsisabr.c:1.5
--- src/sys/arch/arc/dti/arcsisabr.c:1.4 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/dti/arcsisabr.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcsisabr.c,v 1.4 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: arcsisabr.c,v 1.5 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -75,14 +75,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,v 1.4 2008/07/05 08:46:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,v 1.5 2011/07/01 19:25:41 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 <machine/platform.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/dti/tyneisabr.c
diff -u src/sys/arch/arc/dti/tyneisabr.c:1.11 src/sys/arch/arc/dti/tyneisabr.c:1.12
--- src/sys/arch/arc/dti/tyneisabr.c:1.11 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/dti/tyneisabr.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tyneisabr.c,v 1.11 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: tyneisabr.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -75,14 +75,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,v 1.11 2008/07/05 08:46:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,v 1.12 2011/07/01 19:25:41 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 <machine/platform.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/isadma_bounce.c
diff -u src/sys/arch/arc/isa/isadma_bounce.c:1.12 src/sys/arch/arc/isa/isadma_bounce.c:1.13
--- src/sys/arch/arc/isa/isadma_bounce.c:1.12 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/isa/isadma_bounce.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.12 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.13 2011/07/01 19:25:41 dyoung Exp $ */
/* NetBSD: isadma_bounce.c,v 1.2 2000/06/01 05:49:36 thorpej Exp */
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.12 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.13 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <sys/mbuf.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/isapnp_machdep.c
diff -u src/sys/arch/arc/isa/isapnp_machdep.c:1.8 src/sys/arch/arc/isa/isapnp_machdep.c:1.9
--- src/sys/arch/arc/isa/isapnp_machdep.c:1.8 Mon Apr 28 20:23:13 2008
+++ src/sys/arch/arc/isa/isapnp_machdep.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.8 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.9 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: isapnp_machdep.c,v 1.1 1997/12/27 12:13:11 niklas Exp $ */
/* NetBSD: isapnp_machdep.c,v 1.5 1997/10/04 17:32:30 thorpej Exp */
@@ -47,14 +47,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.8 2008/04/28 20:23:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.9 2011/07/01 19:25:41 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 <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/mcclock_isa.c
diff -u src/sys/arch/arc/isa/mcclock_isa.c:1.14 src/sys/arch/arc/isa/mcclock_isa.c:1.15
--- src/sys/arch/arc/isa/mcclock_isa.c:1.14 Tue Feb 8 20:20:09 2011
+++ src/sys/arch/arc/isa/mcclock_isa.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.14 2011/02/08 20:20:09 rmind Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
@@ -41,13 +41,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.14 2011/02/08 20:20:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/opms_isa.c
diff -u src/sys/arch/arc/isa/opms_isa.c:1.11 src/sys/arch/arc/isa/opms_isa.c:1.12
--- src/sys/arch/arc/isa/opms_isa.c:1.11 Sun Mar 6 14:58:43 2011
+++ src/sys/arch/arc/isa/opms_isa.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opms_isa.c,v 1.11 2011/03/06 14:58:43 tsutsui Exp $ */
+/* $NetBSD: opms_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,14 +28,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.11 2011/03/06 14:58:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/tty.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/pccons_isa.c
diff -u src/sys/arch/arc/isa/pccons_isa.c:1.11 src/sys/arch/arc/isa/pccons_isa.c:1.12
--- src/sys/arch/arc/isa/pccons_isa.c:1.11 Sun Mar 6 14:58:43 2011
+++ src/sys/arch/arc/isa/pccons_isa.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons_isa.c,v 1.11 2011/03/06 14:58:43 tsutsui Exp $ */
+/* $NetBSD: pccons_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $ */
/* NetBSD: vga_isa.c,v 1.4 2000/08/14 20:14:51 thorpej Exp */
/*
@@ -29,13 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons_isa.c,v 1.11 2011/03/06 14:58:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/isa/timer_isa.c
diff -u src/sys/arch/arc/isa/timer_isa.c:1.13 src/sys/arch/arc/isa/timer_isa.c:1.14
--- src/sys/arch/arc/isa/timer_isa.c:1.13 Tue Feb 8 20:20:09 2011
+++ src/sys/arch/arc/isa/timer_isa.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_isa.c,v 1.13 2011/02/08 20:20:09 rmind Exp $ */
+/* $NetBSD: timer_isa.c,v 1.14 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_isa.c,v 1.13 2011/02/08 20:20:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_isa.c,v 1.14 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/jazz/asc.c
diff -u src/sys/arch/arc/jazz/asc.c:1.23 src/sys/arch/arc/jazz/asc.c:1.24
--- src/sys/arch/arc/jazz/asc.c:1.23 Wed May 14 13:29:27 2008
+++ src/sys/arch/arc/jazz/asc.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.23 2008/05/14 13:29:27 tsutsui Exp $ */
+/* $NetBSD: asc.c,v 1.24 2011/07/01 19:25:41 dyoung Exp $ */
/*-
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.23 2008/05/14 13:29:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.24 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -33,7 +33,7 @@
#include <sys/buf.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arc/jazz/bus_dma_jazz.c
diff -u src/sys/arch/arc/jazz/bus_dma_jazz.c:1.16 src/sys/arch/arc/jazz/bus_dma_jazz.c:1.17
--- src/sys/arch/arc/jazz/bus_dma_jazz.c:1.16 Mon Nov 15 06:13:16 2010
+++ src/sys/arch/arc/jazz/bus_dma_jazz.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma_jazz.c,v 1.16 2010/11/15 06:13:16 uebayasi Exp $ */
+/* $NetBSD: bus_dma_jazz.c,v 1.17 2011/07/01 19:25:41 dyoung Exp $ */
/*-
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma_jazz.c,v 1.16 2010/11/15 06:13:16 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma_jazz.c,v 1.17 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@
#include <uvm/uvm_extern.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h>
Index: src/sys/arch/arc/jazz/vga_jazzio.c
diff -u src/sys/arch/arc/jazz/vga_jazzio.c:1.16 src/sys/arch/arc/jazz/vga_jazzio.c:1.17
--- src/sys/arch/arc/jazz/vga_jazzio.c:1.16 Sun Mar 6 14:58:44 2011
+++ src/sys/arch/arc/jazz/vga_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_jazzio.c,v 1.16 2011/03/06 14:58:44 tsutsui Exp $ */
+/* $NetBSD: vga_jazzio.c,v 1.17 2011/07/01 19:25:42 dyoung Exp $ */
/* NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_jazzio.c,v 1.16 2011/03/06 14:58:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_jazzio.c,v 1.17 2011/07/01 19:25:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
#include <mips/pte.h>
Index: src/sys/arch/arc/jazz/com_jazzio.c
diff -u src/sys/arch/arc/jazz/com_jazzio.c:1.11 src/sys/arch/arc/jazz/com_jazzio.c:1.12
--- src/sys/arch/arc/jazz/com_jazzio.c:1.11 Mon Apr 28 20:23:13 2008
+++ src/sys/arch/arc/jazz/com_jazzio.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_jazzio.c,v 1.11 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: com_jazzio.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $ */
/* NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp */
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_jazzio.c,v 1.11 2008/04/28 20:23:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_jazzio.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@
#include <sys/tty.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arc/jazz/jazziovar.h>
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.40 src/sys/arch/arc/jazz/fd.c:1.41
--- src/sys/arch/arc/jazz/fd.c:1.40 Sun Sep 27 05:29:20 2009
+++ src/sys/arch/arc/jazz/fd.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.40 2009/09/27 05:29:20 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.41 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.40 2009/09/27 05:29:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.41 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arc/jazz/fdreg.h>
Index: src/sys/arch/arc/jazz/fdc_jazzio.c
diff -u src/sys/arch/arc/jazz/fdc_jazzio.c:1.14 src/sys/arch/arc/jazz/fdc_jazzio.c:1.15
--- src/sys/arch/arc/jazz/fdc_jazzio.c:1.14 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/jazz/fdc_jazzio.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_jazzio.c,v 1.14 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: fdc_jazzio.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_jazzio.c,v 1.14 2008/07/05 08:46:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_jazzio.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/fdreg.h>
Index: src/sys/arch/arc/jazz/jazzdmatlb.c
diff -u src/sys/arch/arc/jazz/jazzdmatlb.c:1.14 src/sys/arch/arc/jazz/jazzdmatlb.c:1.15
--- src/sys/arch/arc/jazz/jazzdmatlb.c:1.14 Wed Mar 1 12:38:10 2006
+++ src/sys/arch/arc/jazz/jazzdmatlb.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jazzdmatlb.c,v 1.14 2006/03/01 12:38:10 yamt Exp $ */
+/* $NetBSD: jazzdmatlb.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jazzdmatlb.c,v 1.14 2006/03/01 12:38:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jazzdmatlb.c,v 1.15 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h>
Index: src/sys/arch/arc/jazz/if_sn_jazzio.c
diff -u src/sys/arch/arc/jazz/if_sn_jazzio.c:1.12 src/sys/arch/arc/jazz/if_sn_jazzio.c:1.13
--- src/sys/arch/arc/jazz/if_sn_jazzio.c:1.12 Tue Jan 19 22:06:19 2010
+++ src/sys/arch/arc/jazz/if_sn_jazzio.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sn_jazzio.c,v 1.12 2010/01/19 22:06:19 pooka Exp $ */
+/* $NetBSD: if_sn_jazzio.c,v 1.13 2011/07/01 19:25:41 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn_jazzio.c,v 1.12 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn_jazzio.c,v 1.13 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@
#include <net/if_ether.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/dp83932reg.h>
Index: src/sys/arch/arc/jazz/jazzisabr.c
diff -u src/sys/arch/arc/jazz/jazzisabr.c:1.12 src/sys/arch/arc/jazz/jazzisabr.c:1.13
--- src/sys/arch/arc/jazz/jazzisabr.c:1.12 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/jazz/jazzisabr.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jazzisabr.c,v 1.12 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: jazzisabr.c,v 1.13 2011/07/01 19:25:42 dyoung Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -75,14 +75,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,v 1.12 2008/07/05 08:46:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,v 1.13 2011/07/01 19:25:42 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 <machine/platform.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/arc/jazz/mcclock_jazzio.c
diff -u src/sys/arch/arc/jazz/mcclock_jazzio.c:1.12 src/sys/arch/arc/jazz/mcclock_jazzio.c:1.13
--- src/sys/arch/arc/jazz/mcclock_jazzio.c:1.12 Tue Feb 8 20:20:09 2011
+++ src/sys/arch/arc/jazz/mcclock_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_jazzio.c,v 1.12 2011/02/08 20:20:09 rmind Exp $ */
+/* $NetBSD: mcclock_jazzio.c,v 1.13 2011/07/01 19:25:42 dyoung Exp $ */
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_jazzio.c,v 1.12 2011/02/08 20:20:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_jazzio.c,v 1.13 2011/07/01 19:25:42 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 <dev/clock_subr.h>
Index: src/sys/arch/arc/jazz/jazzio.c
diff -u src/sys/arch/arc/jazz/jazzio.c:1.21 src/sys/arch/arc/jazz/jazzio.c:1.22
--- src/sys/arch/arc/jazz/jazzio.c:1.21 Sun Mar 6 14:58:44 2011
+++ src/sys/arch/arc/jazz/jazzio.c Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jazzio.c,v 1.21 2011/03/06 14:58:44 tsutsui Exp $ */
+/* $NetBSD: jazzio.c,v 1.22 2011/07/01 19:25:41 dyoung Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@@ -31,13 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.21 2011/03/06 14:58:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.22 2011/07/01 19:25:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/autoconf.h>
#include <machine/platform.h>
Index: src/sys/arch/arc/jazz/jazziovar.h
diff -u src/sys/arch/arc/jazz/jazziovar.h:1.7 src/sys/arch/arc/jazz/jazziovar.h:1.8
--- src/sys/arch/arc/jazz/jazziovar.h:1.7 Sun Mar 4 05:59:36 2007
+++ src/sys/arch/arc/jazz/jazziovar.h Fri Jul 1 19:25:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jazziovar.h,v 1.7 2007/03/04 05:59:36 christos Exp $ */
+/* $NetBSD: jazziovar.h,v 1.8 2011/07/01 19:25:41 dyoung Exp $ */
/*-
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
@@ -29,7 +29,7 @@
#ifndef __JAZZIOVAR_H
#define __JAZZIOVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
struct jazzio_attach_args {
const char *ja_name;
Index: src/sys/arch/arc/jazz/lpt_jazzio.c
diff -u src/sys/arch/arc/jazz/lpt_jazzio.c:1.9 src/sys/arch/arc/jazz/lpt_jazzio.c:1.10
--- src/sys/arch/arc/jazz/lpt_jazzio.c:1.9 Sun Mar 6 14:58:44 2011
+++ src/sys/arch/arc/jazz/lpt_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_jazzio.c,v 1.9 2011/03/06 14:58:44 tsutsui Exp $ */
+/* $NetBSD: lpt_jazzio.c,v 1.10 2011/07/01 19:25:42 dyoung Exp $ */
/* $OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $ */
/*
@@ -55,14 +55,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_jazzio.c,v 1.9 2011/03/06 14:58:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_jazzio.c,v 1.10 2011/07/01 19:25:42 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 <machine/intr.h>
#include <dev/ic/lptreg.h>
Index: src/sys/arch/arc/jazz/osiop_jazzio.c
diff -u src/sys/arch/arc/jazz/osiop_jazzio.c:1.9 src/sys/arch/arc/jazz/osiop_jazzio.c:1.10
--- src/sys/arch/arc/jazz/osiop_jazzio.c:1.9 Wed May 14 13:29:27 2008
+++ src/sys/arch/arc/jazz/osiop_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_jazzio.c,v 1.9 2008/05/14 13:29:27 tsutsui Exp $ */
+/* $NetBSD: osiop_jazzio.c,v 1.10 2011/07/01 19:25:42 dyoung Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_jazzio.c,v 1.9 2008/05/14 13:29:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_jazzio.c,v 1.10 2011/07/01 19:25:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/osiopreg.h>
#include <dev/ic/osiopvar.h>
Index: src/sys/arch/arc/jazz/oosiop_jazzio.c
diff -u src/sys/arch/arc/jazz/oosiop_jazzio.c:1.6 src/sys/arch/arc/jazz/oosiop_jazzio.c:1.7
--- src/sys/arch/arc/jazz/oosiop_jazzio.c:1.6 Sat Mar 29 09:11:35 2008
+++ src/sys/arch/arc/jazz/oosiop_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop_jazzio.c,v 1.6 2008/03/29 09:11:35 tsutsui Exp $ */
+/* $NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.6 2008/03/29 09:11:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/oosiopreg.h>
#include <dev/ic/oosiopvar.h>
Index: src/sys/arch/arc/jazz/opms_jazzio.c
diff -u src/sys/arch/arc/jazz/opms_jazzio.c:1.10 src/sys/arch/arc/jazz/opms_jazzio.c:1.11
--- src/sys/arch/arc/jazz/opms_jazzio.c:1.10 Sun Mar 6 14:58:44 2011
+++ src/sys/arch/arc/jazz/opms_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opms_jazzio.c,v 1.10 2011/03/06 14:58:44 tsutsui Exp $ */
+/* $NetBSD: opms_jazzio.c,v 1.11 2011/07/01 19:25:42 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms_jazzio.c,v 1.10 2011/03/06 14:58:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms_jazzio.c,v 1.11 2011/07/01 19:25:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/tty.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/dev/pcconsvar.h>
#include <arc/dev/opmsvar.h>
Index: src/sys/arch/arc/jazz/pccons_jazzio.c
diff -u src/sys/arch/arc/jazz/pccons_jazzio.c:1.10 src/sys/arch/arc/jazz/pccons_jazzio.c:1.11
--- src/sys/arch/arc/jazz/pccons_jazzio.c:1.10 Sun Mar 6 14:58:44 2011
+++ src/sys/arch/arc/jazz/pccons_jazzio.c Fri Jul 1 19:25:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons_jazzio.c,v 1.10 2011/03/06 14:58:44 tsutsui Exp $ */
+/* $NetBSD: pccons_jazzio.c,v 1.11 2011/07/01 19:25:42 dyoung Exp $ */
/* NetBSD: vga_isa.c,v 1.4 2000/08/14 20:14:51 thorpej Exp */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons_jazzio.c,v 1.10 2011/03/06 14:58:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons_jazzio.c,v 1.11 2011/07/01 19:25:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
#include <mips/pte.h>
