Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:22:35 UTC 2011
Modified Files:
src/sys/arch/alpha/alpha: api_up1000.c dec_1000a.c dec_2100_a50.c
dec_2100_a500.c dec_550.c dec_6600.c dec_alphabook1.c dec_eb164.c
dec_eb66.c dec_kn20aa.c kgdb_machdep.c mcclock.c
src/sys/arch/alpha/common: bus_dma.c comlogout.c sgmap_common.c
sgmapvar.h
src/sys/arch/alpha/isa: isadma_bounce.c isapnp_machdep.c mcclock_isa.c
src/sys/arch/alpha/jensenio: com_jensenio.c jensenio_bus_intio.c
jensenio_bus_io.c jensenio_bus_mem.c jensenio_dma.c lpt_jensenio.c
mcclock_jensenio.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/alpha/api_up1000.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/alpha/dec_1000a.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/alpha/alpha/dec_2100_a50.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/alpha/alpha/dec_2100_a500.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/alpha/dec_550.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/alpha/dec_6600.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/alpha/dec_alphabook1.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/alpha/alpha/dec_eb164.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/alpha/dec_eb66.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/alpha/alpha/dec_kn20aa.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/alpha/kgdb_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/alpha/mcclock.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/alpha/common/bus_dma.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/common/comlogout.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/common/sgmap_common.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/common/sgmapvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/isa/isadma_bounce.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/isa/isapnp_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/isa/mcclock_isa.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/jensenio/com_jensenio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/jensenio/jensenio_bus_intio.c \
src/sys/arch/alpha/jensenio/jensenio_bus_io.c \
src/sys/arch/alpha/jensenio/jensenio_bus_mem.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/jensenio/jensenio_dma.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/jensenio/lpt_jensenio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/jensenio/mcclock_jensenio.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/alpha/alpha/api_up1000.c
diff -u src/sys/arch/alpha/alpha/api_up1000.c:1.27 src/sys/arch/alpha/alpha/api_up1000.c:1.28
--- src/sys/arch/alpha/alpha/api_up1000.c:1.27 Tue Jun 14 15:34:21 2011
+++ src/sys/arch/alpha/alpha/api_up1000.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: api_up1000.c,v 1.27 2011/06/14 15:34:21 matt Exp $ */
+/* $NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.27 2011/06/14 15:34:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_1000a.c
diff -u src/sys/arch/alpha/alpha/dec_1000a.c:1.30 src/sys/arch/alpha/alpha/dec_1000a.c:1.31
--- src/sys/arch/alpha/alpha/dec_1000a.c:1.30 Tue Jun 14 15:34:21 2011
+++ src/sys/arch/alpha/alpha/dec_1000a.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.30 2011/06/14 15:34:21 matt Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.31 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.30 2011/06/14 15:34:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.31 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_2100_a50.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a50.c:1.64 src/sys/arch/alpha/alpha/dec_2100_a50.c:1.65
--- src/sys/arch/alpha/alpha/dec_2100_a50.c:1.64 Tue Jun 14 15:34:21 2011
+++ src/sys/arch/alpha/alpha/dec_2100_a50.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a50.c,v 1.64 2011/06/14 15:34:21 matt Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.65 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.64 2011/06/14 15:34:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.65 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <machine/alpha.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_2100_a500.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a500.c:1.20 src/sys/arch/alpha/alpha/dec_2100_a500.c:1.21
--- src/sys/arch/alpha/alpha/dec_2100_a500.c:1.20 Tue Jun 14 15:34:21 2011
+++ src/sys/arch/alpha/alpha/dec_2100_a500.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a500.c,v 1.20 2011/06/14 15:34:21 matt Exp $ */
+/* $NetBSD: dec_2100_a500.c,v 1.21 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.20 2011/06/14 15:34:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.21 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/alpha/alpha/dec_550.c
diff -u src/sys/arch/alpha/alpha/dec_550.c:1.33 src/sys/arch/alpha/alpha/dec_550.c:1.34
--- src/sys/arch/alpha/alpha/dec_550.c:1.33 Tue Jun 14 15:34:21 2011
+++ src/sys/arch/alpha/alpha/dec_550.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.33 2011/06/14 15:34:21 matt Exp $ */
+/* $NetBSD: dec_550.c,v 1.34 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.33 2011/06/14 15:34:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.34 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_6600.c
diff -u src/sys/arch/alpha/alpha/dec_6600.c:1.31 src/sys/arch/alpha/alpha/dec_6600.c:1.32
--- src/sys/arch/alpha/alpha/dec_6600.c:1.31 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/alpha/dec_6600.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_6600.c,v 1.31 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dec_6600.c,v 1.32 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.31 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.32 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <machine/logout.h>
Index: src/sys/arch/alpha/alpha/dec_alphabook1.c
diff -u src/sys/arch/alpha/alpha/dec_alphabook1.c:1.24 src/sys/arch/alpha/alpha/dec_alphabook1.c:1.25
--- src/sys/arch/alpha/alpha/dec_alphabook1.c:1.24 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/alpha/dec_alphabook1.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.24 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.24 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_eb164.c
diff -u src/sys/arch/alpha/alpha/dec_eb164.c:1.59 src/sys/arch/alpha/alpha/dec_eb164.c:1.60
--- src/sys/arch/alpha/alpha/dec_eb164.c:1.59 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/alpha/dec_eb164.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb164.c,v 1.59 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dec_eb164.c,v 1.60 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.59 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.60 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_eb66.c
diff -u src/sys/arch/alpha/alpha/dec_eb66.c:1.25 src/sys/arch/alpha/alpha/dec_eb66.c:1.26
--- src/sys/arch/alpha/alpha/dec_eb66.c:1.25 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/alpha/dec_eb66.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb66.c,v 1.25 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dec_eb66.c,v 1.26 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.25 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.26 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/alpha/alpha/dec_kn20aa.c
diff -u src/sys/arch/alpha/alpha/dec_kn20aa.c:1.62 src/sys/arch/alpha/alpha/dec_kn20aa.c:1.63
--- src/sys/arch/alpha/alpha/dec_kn20aa.c:1.62 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/alpha/dec_kn20aa.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn20aa.c,v 1.62 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: dec_kn20aa.c,v 1.63 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.62 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.63 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <machine/logout.h>
Index: src/sys/arch/alpha/alpha/kgdb_machdep.c
diff -u src/sys/arch/alpha/alpha/kgdb_machdep.c:1.7 src/sys/arch/alpha/alpha/kgdb_machdep.c:1.8
--- src/sys/arch/alpha/alpha/kgdb_machdep.c:1.7 Wed Dec 15 01:32:31 2010
+++ src/sys/arch/alpha/alpha/kgdb_machdep.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.7 2010/12/15 01:32:31 matt Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.8 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.7 2010/12/15 01:32:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2011/07/01 19:22:35 dyoung Exp $");
#include "com.h"
@@ -46,7 +46,7 @@
#include <sys/systm.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/db_machdep.h>
#if NCOM > 0
Index: src/sys/arch/alpha/alpha/mcclock.c
diff -u src/sys/arch/alpha/alpha/mcclock.c:1.16 src/sys/arch/alpha/alpha/mcclock.c:1.17
--- src/sys/arch/alpha/alpha/mcclock.c:1.16 Thu Mar 5 01:48:58 2009
+++ src/sys/arch/alpha/alpha/mcclock.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.16 2009/03/05 01:48:58 msaitoh Exp $ */
+/* $NetBSD: mcclock.c,v 1.17 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.16 2009/03/05 01:48:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.17 2011/07/01 19:22:35 dyoung Exp $");
#include "opt_clock_compat_osf1.h"
@@ -38,7 +38,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu_counter.h>
#include <dev/clock_subr.h>
Index: src/sys/arch/alpha/common/bus_dma.c
diff -u src/sys/arch/alpha/common/bus_dma.c:1.67 src/sys/arch/alpha/common/bus_dma.c:1.68
--- src/sys/arch/alpha/common/bus_dma.c:1.67 Fri Aug 21 03:39:41 2009
+++ src/sys/arch/alpha/common/bus_dma.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.67 2009/08/21 03:39:41 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.68 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.67 2009/08/21 03:39:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.68 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <uvm/uvm_extern.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <common/bus_dma/bus_dmamem_common.h>
Index: src/sys/arch/alpha/common/comlogout.c
diff -u src/sys/arch/alpha/common/comlogout.c:1.4 src/sys/arch/alpha/common/comlogout.c:1.5
--- src/sys/arch/alpha/common/comlogout.c:1.4 Wed Jan 3 21:40:25 2001
+++ src/sys/arch/alpha/common/comlogout.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: comlogout.c,v 1.4 2001/01/03 21:40:25 thorpej Exp $ */
+/* $NetBSD: comlogout.c,v 1.5 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: comlogout.c,v 1.4 2001/01/03 21:40:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: comlogout.c,v 1.5 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/cpuconf.h>
#include <machine/logout.h>
Index: src/sys/arch/alpha/common/sgmap_common.c
diff -u src/sys/arch/alpha/common/sgmap_common.c:1.24 src/sys/arch/alpha/common/sgmap_common.c:1.25
--- src/sys/arch/alpha/common/sgmap_common.c:1.24 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/common/sgmap_common.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_common.c,v 1.24 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: sgmap_common.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.24 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap_common.c,v 1.25 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/common/sgmapvar.h>
Index: src/sys/arch/alpha/common/sgmapvar.h
diff -u src/sys/arch/alpha/common/sgmapvar.h:1.15 src/sys/arch/alpha/common/sgmapvar.h:1.16
--- src/sys/arch/alpha/common/sgmapvar.h:1.15 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/common/sgmapvar.h Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmapvar.h,v 1.15 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: sgmapvar.h,v 1.16 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _ALPHA_COMMON_SGMAPVAR_H
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Bits n:13 of the DMA address are the index of the PTE into
Index: src/sys/arch/alpha/isa/isadma_bounce.c
diff -u src/sys/arch/alpha/isa/isadma_bounce.c:1.10 src/sys/arch/alpha/isa/isadma_bounce.c:1.11
--- src/sys/arch/alpha/isa/isadma_bounce.c:1.10 Wed Dec 15 01:29:37 2010
+++ src/sys/arch/alpha/isa/isadma_bounce.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.11 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.11 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <sys/mbuf.h>
#define _ALPHA_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/alpha/isa/isapnp_machdep.c
diff -u src/sys/arch/alpha/isa/isapnp_machdep.c:1.7 src/sys/arch/alpha/isa/isapnp_machdep.c:1.8
--- src/sys/arch/alpha/isa/isapnp_machdep.c:1.7 Sat Mar 14 15:35:59 2009
+++ src/sys/arch/alpha/isa/isapnp_machdep.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.7 2009/03/14 15:35:59 dsl Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.8 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -45,14 +45,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.7 2009/03/14 15:35:59 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.8 2011/07/01 19:22:35 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/alpha/isa/mcclock_isa.c
diff -u src/sys/arch/alpha/isa/mcclock_isa.c:1.19 src/sys/arch/alpha/isa/mcclock_isa.c:1.20
--- src/sys/arch/alpha/isa/mcclock_isa.c:1.19 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/alpha/isa/mcclock_isa.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.19 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.20 2011/07/01 19:22:35 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.19 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.20 2011/07/01 19:22:35 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/clock_subr.h>
Index: src/sys/arch/alpha/jensenio/com_jensenio.c
diff -u src/sys/arch/alpha/jensenio/com_jensenio.c:1.12 src/sys/arch/alpha/jensenio/com_jensenio.c:1.13
--- src/sys/arch/alpha/jensenio/com_jensenio.c:1.12 Tue Jun 14 15:34:22 2011
+++ src/sys/arch/alpha/jensenio/com_jensenio.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_jensenio.c,v 1.12 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: com_jensenio.c,v 1.13 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.12 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.13 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <sys/device.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/alpha/jensenio/jensenio_bus_intio.c
diff -u src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.2 src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.3
--- src/sys/arch/alpha/jensenio/jensenio_bus_intio.c:1.2 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/jensenio/jensenio_bus_intio.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_bus_intio.c,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio_bus_intio.c,v 1.2 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio_bus_intio.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: src/sys/arch/alpha/jensenio/jensenio_bus_io.c
diff -u src/sys/arch/alpha/jensenio/jensenio_bus_io.c:1.2 src/sys/arch/alpha/jensenio/jensenio_bus_io.c:1.3
--- src/sys/arch/alpha/jensenio/jensenio_bus_io.c:1.2 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/jensenio/jensenio_bus_io.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_bus_io.c,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: jensenio_bus_io.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: jensenio_bus_io.c,v 1.2 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: jensenio_bus_io.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: src/sys/arch/alpha/jensenio/jensenio_bus_mem.c
diff -u src/sys/arch/alpha/jensenio/jensenio_bus_mem.c:1.2 src/sys/arch/alpha/jensenio/jensenio_bus_mem.c:1.3
--- src/sys/arch/alpha/jensenio/jensenio_bus_mem.c:1.2 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/jensenio/jensenio_bus_mem.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_bus_mem.c,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: jensenio_bus_mem.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(1, "$NetBSD: jensenio_bus_mem.c,v 1.2 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: jensenio_bus_mem.c,v 1.3 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: src/sys/arch/alpha/jensenio/jensenio_dma.c
diff -u src/sys/arch/alpha/jensenio/jensenio_dma.c:1.3 src/sys/arch/alpha/jensenio/jensenio_dma.c:1.4
--- src/sys/arch/alpha/jensenio/jensenio_dma.c:1.3 Tue Feb 2 20:40:07 2010
+++ src/sys/arch/alpha/jensenio/jensenio_dma.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_dma.c,v 1.3 2010/02/02 20:40:07 skrll Exp $ */
+/* $NetBSD: jensenio_dma.c,v 1.4 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.3 2010/02/02 20:40:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.4 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@
#include <sys/mbuf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: src/sys/arch/alpha/jensenio/lpt_jensenio.c
diff -u src/sys/arch/alpha/jensenio/lpt_jensenio.c:1.10 src/sys/arch/alpha/jensenio/lpt_jensenio.c:1.11
--- src/sys/arch/alpha/jensenio/lpt_jensenio.c:1.10 Sat Nov 21 05:35:41 2009
+++ src/sys/arch/alpha/jensenio/lpt_jensenio.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_jensenio.c,v 1.10 2009/11/21 05:35:41 rmind Exp $ */
+/* $NetBSD: lpt_jensenio.c,v 1.11 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lpt_jensenio.c,v 1.10 2009/11/21 05:35:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_jensenio.c,v 1.11 2011/07/01 19:22:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: src/sys/arch/alpha/jensenio/mcclock_jensenio.c
diff -u src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.9 src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.10
--- src/sys/arch/alpha/jensenio/mcclock_jensenio.c:1.9 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/jensenio/mcclock_jensenio.c Fri Jul 1 19:22:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_jensenio.c,v 1.9 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: mcclock_jensenio.c,v 1.10 2011/07/01 19:22:35 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -58,14 +58,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_jensenio.c,v 1.9 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_jensenio.c,v 1.10 2011/07/01 19:22:35 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/clock_subr.h>
