Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:26:36 UTC 2011
Modified Files:
src/sys/arch/arm/iomd: iomd.c iomd_io.c iomdkbc.c iomdvar.h qms.c
vidc20.c vidcvideo.c
src/sys/arch/arm/iomd/console: consinit.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/iomd/iomd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/iomd/iomd_io.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/iomd/iomdkbc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/iomd/iomdvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/iomd/qms.c \
src/sys/arch/arm/iomd/vidc20.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/iomd/vidcvideo.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/iomd/console/consinit.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/arm/iomd/iomd.c
diff -u src/sys/arch/arm/iomd/iomd.c:1.16 src/sys/arch/arm/iomd/iomd.c:1.17
--- src/sys/arch/arm/iomd/iomd.c:1.16 Thu Jun 30 20:09:20 2011
+++ src/sys/arch/arm/iomd/iomd.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $ */
+/* $NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.16 2011/06/30 20:09:20 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.17 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <sys/conf.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <arm/iomd/iomdreg.h>
Index: src/sys/arch/arm/iomd/iomd_io.c
diff -u src/sys/arch/arm/iomd/iomd_io.c:1.5 src/sys/arch/arm/iomd/iomd_io.c:1.6
--- src/sys/arch/arm/iomd/iomd_io.c:1.5 Sat Aug 5 18:22:57 2006
+++ src/sys/arch/arm/iomd/iomd_io.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $ */
+/* $NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -38,11 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd_io.c,v 1.5 2006/08/05 18:22:57 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_io.c,v 1.6 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/arm/iomd/iomdkbc.c
diff -u src/sys/arch/arm/iomd/iomdkbc.c:1.3 src/sys/arch/arm/iomd/iomdkbc.c:1.4
--- src/sys/arch/arm/iomd/iomdkbc.c:1.3 Sat Oct 21 22:45:03 2006
+++ src/sys/arch/arm/iomd/iomdkbc.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $ */
+/* $NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $ */
/*-
* Copyright (c) 2004 Ben Harris
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.3 2006/10/21 22:45:03 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.4 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -37,7 +37,7 @@
#include <dev/pckbport/pckbportvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/iomd/iomdreg.h>
Index: src/sys/arch/arm/iomd/iomdvar.h
diff -u src/sys/arch/arm/iomd/iomdvar.h:1.2 src/sys/arch/arm/iomd/iomdvar.h:1.3
--- src/sys/arch/arm/iomd/iomdvar.h:1.2 Fri Apr 19 01:04:39 2002
+++ src/sys/arch/arm/iomd/iomdvar.h Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iomdvar.h,v 1.2 2002/04/19 01:04:39 wiz Exp $ */
+/* $NetBSD: iomdvar.h,v 1.3 2011/07/01 20:26:35 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -39,7 +39,7 @@
* Created : 02/02/97
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Attach args for iomd_clock device
Index: src/sys/arch/arm/iomd/qms.c
diff -u src/sys/arch/arm/iomd/qms.c:1.15 src/sys/arch/arm/iomd/qms.c:1.16
--- src/sys/arch/arm/iomd/qms.c:1.15 Sat May 10 15:31:04 2008
+++ src/sys/arch/arm/iomd/qms.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $ */
+/* $NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $ */
/*-
* Copyright (c) 2001 Reinoud Zandijk
@@ -41,7 +41,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.15 2008/05/10 15:31:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/callout.h>
#include <sys/device.h>
@@ -56,7 +56,7 @@
#include <sys/systm.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/iomd/iomdvar.h>
Index: src/sys/arch/arm/iomd/vidc20.c
diff -u src/sys/arch/arm/iomd/vidc20.c:1.15 src/sys/arch/arm/iomd/vidc20.c:1.16
--- src/sys/arch/arm/iomd/vidc20.c:1.15 Sat Aug 5 18:22:57 2006
+++ src/sys/arch/arm/iomd/vidc20.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vidc20.c,v 1.15 2006/08/05 18:22:57 bjh21 Exp $ */
+/* $NetBSD: vidc20.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.15 2006/08/05 18:22:57 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.16 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/iomd/vidc.h>
#include <machine/io.h>
#include <arm/iomd/iomdreg.h>
Index: src/sys/arch/arm/iomd/vidcvideo.c
diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.38 src/sys/arch/arm/iomd/vidcvideo.c:1.39
--- src/sys/arch/arm/iomd/vidcvideo.c:1.38 Wed Oct 21 00:30:43 2009
+++ src/sys/arch/arm/iomd/vidcvideo.c Fri Jul 1 20:26:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@@ -30,7 +30,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/ioctl.h>
#include <arm/mainbus/mainbus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/arm/iomd/console/consinit.c
diff -u src/sys/arch/arm/iomd/console/consinit.c:1.7 src/sys/arch/arm/iomd/console/consinit.c:1.8
--- src/sys/arch/arm/iomd/console/consinit.c:1.7 Wed Aug 16 07:59:44 2006
+++ src/sys/arch/arm/iomd/console/consinit.c Fri Jul 1 20:26:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.7 2006/08/16 07:59:44 he Exp $ */
+/* $NetBSD: consinit.c,v 1.8 2011/07/01 20:26:36 dyoung Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2006/08/16 07:59:44 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 20:26:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
