Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:30:36 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p4032_dma.c algor_p4032_intr.c
algor_p4032var.h algor_p5064_dma.c algor_p5064_intr.c
algor_p5064var.h algor_p6032_dma.c algor_p6032_intr.c
algor_p6032var.h autoconf.c bus_dma.c machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p4032_dma.c \
src/sys/arch/algor/algor/algor_p4032var.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/algor/algor_p4032_intr.c \
src/sys/arch/algor/algor/bus_dma.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/algor/algor_p5064_dma.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/algor/algor/algor_p5064_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/algor/algor_p5064var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p6032_dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/algor/algor_p6032_intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/algor/algor_p6032var.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/algor/algor/autoconf.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/algor/algor/machdep.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/algor/algor/algor_p4032_dma.c
diff -u src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 src/sys/arch/algor/algor/algor_p4032_dma.c:1.7
--- src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/algor/algor_p4032_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p4032reg.h>
#include <algor/algor/algor_p4032var.h>
Index: src/sys/arch/algor/algor/algor_p4032var.h
diff -u src/sys/arch/algor/algor/algor_p4032var.h:1.6 src/sys/arch/algor/algor/algor_p4032var.h:1.7
--- src/sys/arch/algor/algor/algor_p4032var.h:1.6 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p4032var.h Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p4032var.h,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
struct p4032_config {
Index: src/sys/arch/algor/algor/algor_p4032_intr.c
diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 src/sys/arch/algor/algor/algor_p4032_intr.c:1.23
--- src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 Thu Apr 7 04:01:40 2011
+++ src/sys/arch/algor/algor/algor_p4032_intr.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -51,7 +51,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/algor/algor/bus_dma.c
diff -u src/sys/arch/algor/algor/bus_dma.c:1.22 src/sys/arch/algor/algor/bus_dma.c:1.23
--- src/sys/arch/algor/algor/bus_dma.c:1.22 Mon Dec 14 00:45:59 2009
+++ src/sys/arch/algor/algor/bus_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 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: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <mips/cache.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
Index: src/sys/arch/algor/algor/algor_p5064_dma.c
diff -u src/sys/arch/algor/algor/algor_p5064_dma.c:1.4 src/sys/arch/algor/algor/algor_p5064_dma.c:1.5
--- src/sys/arch/algor/algor/algor_p5064_dma.c:1.4 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/algor/algor_p5064_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p5064reg.h>
#include <algor/algor/algor_p5064var.h>
Index: src/sys/arch/algor/algor/algor_p5064_intr.c
diff -u src/sys/arch/algor/algor/algor_p5064_intr.c:1.25 src/sys/arch/algor/algor/algor_p5064_intr.c:1.26
--- src/sys/arch/algor/algor/algor_p5064_intr.c:1.25 Wed Apr 6 01:25:18 2011
+++ src/sys/arch/algor/algor/algor_p5064_intr.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $ */
+/* $NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -51,7 +51,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/algor/algor/algor_p5064var.h
diff -u src/sys/arch/algor/algor/algor_p5064var.h:1.7 src/sys/arch/algor/algor/algor_p5064var.h:1.8
--- src/sys/arch/algor/algor/algor_p5064var.h:1.7 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p5064var.h Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064var.h,v 1.7 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p5064var.h,v 1.8 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/algor/algor/algor_p6032_dma.c
diff -u src/sys/arch/algor/algor/algor_p6032_dma.c:1.5 src/sys/arch/algor/algor/algor_p6032_dma.c:1.6
--- src/sys/arch/algor/algor/algor_p6032_dma.c:1.5 Mon Oct 26 00:59:39 2009
+++ src/sys/arch/algor/algor/algor_p6032_dma.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $ */
+/* $NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p6032reg.h>
#include <algor/algor/algor_p6032var.h>
Index: src/sys/arch/algor/algor/algor_p6032_intr.c
diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.19 src/sys/arch/algor/algor/algor_p6032_intr.c:1.20
--- src/sys/arch/algor/algor/algor_p6032_intr.c:1.19 Thu Apr 7 04:01:40 2011
+++ src/sys/arch/algor/algor/algor_p6032_intr.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -50,7 +50,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/algor/algor/algor_p6032var.h
diff -u src/sys/arch/algor/algor/algor_p6032var.h:1.3 src/sys/arch/algor/algor/algor_p6032var.h:1.4
--- src/sys/arch/algor/algor/algor_p6032var.h:1.3 Sat Mar 5 14:04:02 2011
+++ src/sys/arch/algor/algor/algor_p6032var.h Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032var.h,v 1.3 2011/03/05 14:04:02 matt Exp $ */
+/* $NetBSD: algor_p6032var.h,v 1.4 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/algor/algor/autoconf.c
diff -u src/sys/arch/algor/algor/autoconf.c:1.18 src/sys/arch/algor/algor/autoconf.c:1.19
--- src/sys/arch/algor/algor/autoconf.c:1.18 Fri Jan 22 08:56:04 2010
+++ src/sys/arch/algor/algor/autoconf.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -47,7 +47,7 @@
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: src/sys/arch/algor/algor/machdep.c
diff -u src/sys/arch/algor/algor/machdep.c:1.49 src/sys/arch/algor/algor/machdep.c:1.50
--- src/sys/arch/algor/algor/machdep.c:1.49 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/machdep.c Fri Jul 1 18:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -107,7 +107,7 @@
#include <ddb/db_extern.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pmon.h>
#include <machine/pcb.h>
