Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:31:32 UTC 2011
Modified Files:
src/sys/arch/algor/dev: bonito_mainbus.c com_mainbus.c lpt_mainbus.c
mainbus.c mcclock_mainbus.c vtpbc_mainbus.c
src/sys/arch/algor/isa: isadma_bounce.c mcclock_isa.c
src/sys/arch/algor/pci: pcib.c vtpbc.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/algor/dev/bonito_mainbus.c \
src/sys/arch/algor/dev/com_mainbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/algor/dev/lpt_mainbus.c \
src/sys/arch/algor/dev/mcclock_mainbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/dev/vtpbc_mainbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/algor/isa/isadma_bounce.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/algor/isa/mcclock_isa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/algor/pci/pcib.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/pci/vtpbc.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/dev/bonito_mainbus.c
diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.12 src/sys/arch/algor/dev/bonito_mainbus.c:1.13
--- src/sys/arch/algor/dev/bonito_mainbus.c:1.12 Tue May 17 17:34:47 2011
+++ src/sys/arch/algor/dev/bonito_mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $");
#include "opt_algor_p6032.h"
@@ -40,7 +40,7 @@
#include <sys/reboot.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <mips/bonito/bonitoreg.h>
Index: src/sys/arch/algor/dev/com_mainbus.c
diff -u src/sys/arch/algor/dev/com_mainbus.c:1.12 src/sys/arch/algor/dev/com_mainbus.c:1.13
--- src/sys/arch/algor/dev/com_mainbus.c:1.12 Fri Nov 27 03:23:03 2009
+++ src/sys/arch/algor/dev/com_mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <machine/autoconf.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/algor/dev/lpt_mainbus.c
diff -u src/sys/arch/algor/dev/lpt_mainbus.c:1.10 src/sys/arch/algor/dev/lpt_mainbus.c:1.11
--- src/sys/arch/algor/dev/lpt_mainbus.c:1.10 Fri Nov 27 03:23:04 2009
+++ src/sys/arch/algor/dev/lpt_mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $ */
+/* $NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@
#include <machine/autoconf.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/algor/dev/mcclock_mainbus.c
diff -u src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 src/sys/arch/algor/dev/mcclock_mainbus.c:1.11
--- src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/algor/dev/mcclock_mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: src/sys/arch/algor/dev/mainbus.c
diff -u src/sys/arch/algor/dev/mainbus.c:1.22 src/sys/arch/algor/dev/mainbus.c:1.23
--- src/sys/arch/algor/dev/mainbus.c:1.22 Sun Jun 5 17:03:18 2011
+++ src/sys/arch/algor/dev/mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.23 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2011/07/01 18:31:31 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -46,7 +46,7 @@
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <mips/cache.h>
Index: src/sys/arch/algor/dev/vtpbc_mainbus.c
diff -u src/sys/arch/algor/dev/vtpbc_mainbus.c:1.16 src/sys/arch/algor/dev/vtpbc_mainbus.c:1.17
--- src/sys/arch/algor/dev/vtpbc_mainbus.c:1.16 Tue May 17 17:34:47 2011
+++ src/sys/arch/algor/dev/vtpbc_mainbus.c Fri Jul 1 18:31:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: vtpbc_mainbus.c,v 1.17 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.17 2011/07/01 18:31:31 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -41,7 +41,7 @@
#include <sys/reboot.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <algor/pci/vtpbcvar.h>
Index: src/sys/arch/algor/isa/isadma_bounce.c
diff -u src/sys/arch/algor/isa/isadma_bounce.c:1.9 src/sys/arch/algor/isa/isadma_bounce.c:1.10
--- src/sys/arch/algor/isa/isadma_bounce.c:1.9 Sun Feb 20 07:51:22 2011
+++ src/sys/arch/algor/isa/isadma_bounce.c Fri Jul 1 18:31:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 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.9 2011/02/20 07:51:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <mips/cache.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/algor/isa/mcclock_isa.c
diff -u src/sys/arch/algor/isa/mcclock_isa.c:1.12 src/sys/arch/algor/isa/mcclock_isa.c:1.13
--- src/sys/arch/algor/isa/mcclock_isa.c:1.12 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/algor/isa/mcclock_isa.c Fri Jul 1 18:31:32 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:31:32 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:31:32 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/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.21 src/sys/arch/algor/pci/pcib.c:1.22
--- src/sys/arch/algor/pci/pcib.c:1.21 Wed Aug 19 15:17:00 2009
+++ src/sys/arch/algor/pci/pcib.c Fri Jul 1 18:31:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $ */
+/* $NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -43,7 +43,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/algor/pci/vtpbc.c
diff -u src/sys/arch/algor/pci/vtpbc.c:1.7 src/sys/arch/algor/pci/vtpbc.c:1.8
--- src/sys/arch/algor/pci/vtpbc.c:1.7 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/pci/vtpbc.c Fri Jul 1 18:31:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/locore.h>
