Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:11:35 UTC 2011
Modified Files:
src/sys/arch/evbarm/tsarm: epcom_ts.c toastersensors.c tsarm_machdep.c
tskp.c tslcd.c tspld.c tsrtc.c wdc_ts.c
src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tsarm/epcom_ts.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/toastersensors.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/tsarm/tskp.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/tslcd.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/tsarm/tspld.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tsarm/tsrtc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/tsarm/wdc_ts.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/tsarm/isa/isa_io.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/tsarm/isa/isa_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/evbarm/tsarm/epcom_ts.c
diff -u src/sys/arch/evbarm/tsarm/epcom_ts.c:1.4 src/sys/arch/evbarm/tsarm/epcom_ts.c:1.5
--- src/sys/arch/evbarm/tsarm/epcom_ts.c:1.4 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/tsarm/epcom_ts.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom_ts.c,v 1.4 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: epcom_ts.c,v 1.5 2011/07/01 19:11:34 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <[email protected]>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v 1.4 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v 1.5 2011/07/01 19:11:34 dyoung Exp $");
/* Front-end of epcom */
@@ -40,7 +40,7 @@
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: src/sys/arch/evbarm/tsarm/toastersensors.c
diff -u src/sys/arch/evbarm/tsarm/toastersensors.c:1.8 src/sys/arch/evbarm/tsarm/toastersensors.c:1.9
--- src/sys/arch/evbarm/tsarm/toastersensors.c:1.8 Sat Mar 14 15:36:05 2009
+++ src/sys/arch/evbarm/tsarm/toastersensors.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: toastersensors.c,v 1.8 2009/03/14 15:36:05 dsl Exp $ */
+/* $NetBSD: toastersensors.c,v 1.9 2011/07/01 19:11:34 dyoung Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toastersensors.c,v 1.8 2009/03/14 15:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toastersensors.c,v 1.9 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -44,7 +44,7 @@
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.15 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.16
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.15 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.15 2011/06/30 20:09:28 wiz Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.16 2011/07/01 19:11:34 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.15 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.16 2011/07/01 19:11:34 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -99,7 +99,7 @@
#include <ddb/db_extern.h>
#include <acorn32/include/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/tsarm/tskp.c
diff -u src/sys/arch/evbarm/tsarm/tskp.c:1.7 src/sys/arch/evbarm/tsarm/tskp.c:1.8
--- src/sys/arch/evbarm/tsarm/tskp.c:1.7 Sat Mar 14 15:36:05 2009
+++ src/sys/arch/evbarm/tsarm/tskp.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tskp.c,v 1.7 2009/03/14 15:36:05 dsl Exp $ */
+/* $NetBSD: tskp.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tskp.c,v 1.7 2009/03/14 15:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tskp.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/tsarm/tslcd.c
diff -u src/sys/arch/evbarm/tsarm/tslcd.c:1.13 src/sys/arch/evbarm/tsarm/tslcd.c:1.14
--- src/sys/arch/evbarm/tsarm/tslcd.c:1.13 Sat Mar 14 21:04:08 2009
+++ src/sys/arch/evbarm/tsarm/tslcd.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tslcd.c,v 1.13 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: tslcd.c,v 1.14 2011/07/01 19:11:34 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tslcd.c,v 1.13 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tslcd.c,v 1.14 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsdisplayvar.h>
Index: src/sys/arch/evbarm/tsarm/tspld.c
diff -u src/sys/arch/evbarm/tsarm/tspld.c:1.20 src/sys/arch/evbarm/tsarm/tspld.c:1.21
--- src/sys/arch/evbarm/tsarm/tspld.c:1.20 Fri Oct 23 00:39:31 2009
+++ src/sys/arch/evbarm/tsarm/tspld.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tspld.c,v 1.20 2009/10/23 00:39:31 snj Exp $ */
+/* $NetBSD: tspld.c,v 1.21 2011/07/01 19:11:34 dyoung Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.20 2009/10/23 00:39:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.21 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -38,7 +38,7 @@
#include <sys/device.h>
#include <sys/wdog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/autoconf.h>
#include "isa.h"
Index: src/sys/arch/evbarm/tsarm/tsrtc.c
diff -u src/sys/arch/evbarm/tsarm/tsrtc.c:1.6 src/sys/arch/evbarm/tsarm/tsrtc.c:1.7
--- src/sys/arch/evbarm/tsarm/tsrtc.c:1.6 Fri Apr 4 09:33:07 2008
+++ src/sys/arch/evbarm/tsarm/tsrtc.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsrtc.c,v 1.6 2008/04/04 09:33:07 tsutsui Exp $ */
+/* $NetBSD: tsrtc.c,v 1.7 2011/07/01 19:11:34 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsrtc.c,v 1.6 2008/04/04 09:33:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsrtc.c,v 1.7 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -37,7 +37,7 @@
#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/evbarm/tsarm/wdc_ts.c
diff -u src/sys/arch/evbarm/tsarm/wdc_ts.c:1.5 src/sys/arch/evbarm/tsarm/wdc_ts.c:1.6
--- src/sys/arch/evbarm/tsarm/wdc_ts.c:1.5 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbarm/tsarm/wdc_ts.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ts.c,v 1.5 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: wdc_ts.c,v 1.6 2011/07/01 19:11:34 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.5 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.6 2011/07/01 19:11:34 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 <machine/intr.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: src/sys/arch/evbarm/tsarm/isa/isa_io.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.7 src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.8
--- src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.7 Sat Mar 14 21:04:08 2009
+++ src/sys/arch/evbarm/tsarm/isa/isa_io.c Fri Jul 1 19:11:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.7 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: isa_io.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $ */
/*
* Copyright 1997
@@ -38,13 +38,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.7 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.8 2011/07/01 19:11:34 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
Index: src/sys/arch/evbarm/tsarm/isa/isa_machdep.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.10 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.11
--- src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.10 Wed Aug 19 15:14:59 2009
+++ src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Fri Jul 1 19:11:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.10 2009/08/19 15:14:59 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.11 2011/07/01 19:11:35 dyoung Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.10 2009/08/19 15:14:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.11 2011/07/01 19:11:35 dyoung Exp $");
#include "opt_irqstats.h"
@@ -80,7 +80,7 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
