Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:11:24 UTC 2011
Modified Files:
src/sys/arch/i386/isa: ahc_isa.c cmos.c isapnp_machdep.c lms.c mms.c
npx_isa.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/isa/ahc_isa.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/isa/cmos.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/isa/isapnp_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/isa/lms.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/isa/mms.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/isa/npx_isa.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/i386/isa/ahc_isa.c
diff -u src/sys/arch/i386/isa/ahc_isa.c:1.38 src/sys/arch/i386/isa/ahc_isa.c:1.39
--- src/sys/arch/i386/isa/ahc_isa.c:1.38 Sun Feb 28 15:52:16 2010
+++ src/sys/arch/i386/isa/ahc_isa.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $ */
+/* $NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $ */
/*
* Product specific probe and attach routines for:
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@
#include <sys/malloc.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/scsipi/scsi_all.h>
Index: src/sys/arch/i386/isa/cmos.c
diff -u src/sys/arch/i386/isa/cmos.c:1.8 src/sys/arch/i386/isa/cmos.c:1.9
--- src/sys/arch/i386/isa/cmos.c:1.8 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/i386/isa/cmos.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $ */
/*
* Copyright (C) 2003 JONE System Co., Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/i386/isa/isapnp_machdep.c
diff -u src/sys/arch/i386/isa/isapnp_machdep.c:1.16 src/sys/arch/i386/isa/isapnp_machdep.c:1.17
--- src/sys/arch/i386/isa/isapnp_machdep.c:1.16 Wed Apr 28 19:17:03 2010
+++ src/sys/arch/i386/isa/isapnp_machdep.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -45,14 +45,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 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 <dev/isa/isavar.h>
Index: src/sys/arch/i386/isa/lms.c
diff -u src/sys/arch/i386/isa/lms.c:1.55 src/sys/arch/i386/isa/lms.c:1.56
--- src/sys/arch/i386/isa/lms.c:1.55 Mon May 4 12:14:31 2009
+++ src/sys/arch/i386/isa/lms.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $ */
+/* $NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,14 +24,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ioctl.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/i386/isa/mms.c
diff -u src/sys/arch/i386/isa/mms.c:1.52 src/sys/arch/i386/isa/mms.c:1.53
--- src/sys/arch/i386/isa/mms.c:1.52 Mon May 4 12:14:31 2009
+++ src/sys/arch/i386/isa/mms.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $ */
+/* $NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -32,7 +32,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/i386/isa/npx_isa.c
diff -u src/sys/arch/i386/isa/npx_isa.c:1.21 src/sys/arch/i386/isa/npx_isa.c:1.22
--- src/sys/arch/i386/isa/npx_isa.c:1.21 Mon May 4 12:38:51 2009
+++ src/sys/arch/i386/isa/npx_isa.c Fri Jul 1 18:11:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $ */
+/* $NetBSD: npx_isa.c,v 1.22 2011/07/01 18:11:24 dyoung Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -67,13 +67,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_isa.c,v 1.22 2011/07/01 18:11:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
