Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:46:35 UTC 2011
Modified Files:
src/sys/arch/evbmips/isa: isadma_bounce.c mcclock_isa.c
src/sys/arch/evbmips/malta: autoconf.h malta_dma.c maltavar.h
src/sys/arch/evbmips/malta/pci: pci_machdep.c pcib.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/isa/isadma_bounce.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/isa/mcclock_isa.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/malta/autoconf.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/malta/malta_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/malta/maltavar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/malta/pci/pci_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/malta/pci/pcib.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/evbmips/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.8 src/sys/arch/evbmips/isa/isadma_bounce.c:1.9
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.8 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <mips/cache.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/evbmips/isa/mcclock_isa.c
diff -u src/sys/arch/evbmips/isa/mcclock_isa.c:1.12 src/sys/arch/evbmips/isa/mcclock_isa.c:1.13
--- src/sys/arch/evbmips/isa/mcclock_isa.c:1.12 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/evbmips/isa/mcclock_isa.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46: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.12 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:46: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>
#include <dev/ic/mc146818reg.h>
Index: src/sys/arch/evbmips/malta/autoconf.h
diff -u src/sys/arch/evbmips/malta/autoconf.h:1.1 src/sys/arch/evbmips/malta/autoconf.h:1.2
--- src/sys/arch/evbmips/malta/autoconf.h:1.1 Thu Mar 7 14:44:03 2002
+++ src/sys/arch/evbmips/malta/autoconf.h Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.1 2002/03/07 14:44:03 simonb Exp $ */
+/* $NetBSD: autoconf.h,v 1.2 2011/07/01 18:46:35 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
const char *ma_name;
Index: src/sys/arch/evbmips/malta/malta_dma.c
diff -u src/sys/arch/evbmips/malta/malta_dma.c:1.8 src/sys/arch/evbmips/malta/malta_dma.c:1.9
--- src/sys/arch/evbmips/malta/malta_dma.c:1.8 Sun Feb 20 07:48:34 2011
+++ src/sys/arch/evbmips/malta/malta_dma.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,13 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malta_dma.c,v 1.8 2011/02/20 07:48:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malta_dma.c,v 1.9 2011/07/01 18:46:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/evbmips/malta/maltavar.h
diff -u src/sys/arch/evbmips/malta/maltavar.h:1.5 src/sys/arch/evbmips/malta/maltavar.h:1.6
--- src/sys/arch/evbmips/malta/maltavar.h:1.5 Sun Feb 20 07:48:34 2011
+++ src/sys/arch/evbmips/malta/maltavar.h Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: maltavar.h,v 1.5 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: maltavar.h,v 1.6 2011/07/01 18:46:35 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/evbmips/malta/pci/pci_machdep.c
diff -u src/sys/arch/evbmips/malta/pci/pci_machdep.c:1.5 src/sys/arch/evbmips/malta/pci/pci_machdep.c:1.6
--- src/sys/arch/evbmips/malta/pci/pci_machdep.c:1.5 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/evbmips/malta/pci/pci_machdep.c Fri Jul 1 18:46:35 2011
@@ -1,13 +1,13 @@
-/* $NetBSD: pci_machdep.c,v 1.5 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.6 2011/07/01 18:46:35 dyoung Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2011/07/01 18:46:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* PCI doesn't have any special needs; just use
Index: src/sys/arch/evbmips/malta/pci/pcib.c
diff -u src/sys/arch/evbmips/malta/pci/pcib.c:1.14 src/sys/arch/evbmips/malta/pci/pcib.c:1.15
--- src/sys/arch/evbmips/malta/pci/pcib.c:1.14 Sun Feb 20 07:48:35 2011
+++ src/sys/arch/evbmips/malta/pci/pcib.c Fri Jul 1 18:46:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.14 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: pcib.c,v 1.15 2011/07/01 18:46:35 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.15 2011/07/01 18:46:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbmips/malta/maltareg.h>
#include <evbmips/malta/maltavar.h>
#include <evbmips/malta/dev/gtreg.h>
