Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:36:42 UTC 2011
Modified Files:
src/sys/arch/cobalt/cobalt: console.c interrupt.c
src/sys/arch/cobalt/dev: com_mainbus.c gt.c mcclock.c panel.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/cobalt/console.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/cobalt/cobalt/interrupt.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cobalt/dev/com_mainbus.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cobalt/dev/mcclock.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cobalt/dev/panel.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/cobalt/cobalt/console.c
diff -u src/sys/arch/cobalt/cobalt/console.c:1.11 src/sys/arch/cobalt/cobalt/console.c:1.12
--- src/sys/arch/cobalt/cobalt/console.c:1.11 Thu Mar 27 15:21:46 2008
+++ src/sys/arch/cobalt/cobalt/console.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $ */
+/* $NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,14 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/nvram.h>
#include <machine/bootinfo.h>
Index: src/sys/arch/cobalt/cobalt/interrupt.c
diff -u src/sys/arch/cobalt/cobalt/interrupt.c:1.6 src/sys/arch/cobalt/cobalt/interrupt.c:1.7
--- src/sys/arch/cobalt/cobalt/interrupt.c:1.6 Sun Feb 20 07:54:10 2011
+++ src/sys/arch/cobalt/cobalt/interrupt.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $");
#define __INTR_PRIVATE
@@ -89,7 +89,7 @@
#include <sys/intr.h>
#include <mips/mips3_clock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i8259reg.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/cobalt/dev/com_mainbus.c
diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.17 src/sys/arch/cobalt/dev/com_mainbus.c:1.18
--- src/sys/arch/cobalt/dev/com_mainbus.c:1.17 Thu Mar 27 15:21:46 2008
+++ src/sys/arch/cobalt/dev/com_mainbus.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,7 +35,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/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.25 src/sys/arch/cobalt/dev/gt.c:1.26
--- src/sys/arch/cobalt/dev/gt.c:1.25 Tue May 17 17:34:48 2011
+++ src/sys/arch/cobalt/dev/gt.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $ */
+/* $NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -48,7 +48,7 @@
#include <sys/extent.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/cache.h>
Index: src/sys/arch/cobalt/dev/mcclock.c
diff -u src/sys/arch/cobalt/dev/mcclock.c:1.4 src/sys/arch/cobalt/dev/mcclock.c:1.5
--- src/sys/arch/cobalt/dev/mcclock.c:1.4 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/cobalt/dev/mcclock.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock.c,v 1.5 2011/07/01 20:36:42 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.5 2011/07/01 20:36:42 dyoung Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -38,7 +38,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/cobalt/dev/panel.c
diff -u src/sys/arch/cobalt/dev/panel.c:1.21 src/sys/arch/cobalt/dev/panel.c:1.22
--- src/sys/arch/cobalt/dev/panel.c:1.21 Tue May 3 09:15:20 2011
+++ src/sys/arch/cobalt/dev/panel.c Fri Jul 1 20:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $ */
+/* $NetBSD: panel.c,v 1.22 2011/07/01 20:36:42 dyoung Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.22 2011/07/01 20:36:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <sys/select.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/ic/hd44780reg.h>
