Module Name: src
Committed By: dyoung
Date: Fri Jul 1 17:37:27 UTC 2011
Modified Files:
src/sys/arch/i386/pci: ali1543.c amd756.c elan520.c gcscehci.c geode.c
geodecntr.c geodewdg.c gscpcib.c opti82c558.c opti82c700.c pceb.c
pci_intr_fixup.c pcmb.c piix.c piixpcib.c sis85c503.c via8231.c
via82c586.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/i386/pci/ali1543.c \
src/sys/arch/i386/pci/via82c586.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pci/amd756.c \
src/sys/arch/i386/pci/gcscehci.c src/sys/arch/i386/pci/geodecntr.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/pci/elan520.c \
src/sys/arch/i386/pci/pci_intr_fixup.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pci/geode.c \
src/sys/arch/i386/pci/piix.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/pci/geodewdg.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/pci/gscpcib.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/pci/opti82c558.c \
src/sys/arch/i386/pci/opti82c700.c src/sys/arch/i386/pci/sis85c503.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/pci/pceb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/pci/pcmb.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/pci/piixpcib.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/pci/via8231.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/pci/ali1543.c
diff -u src/sys/arch/i386/pci/ali1543.c:1.11 src/sys/arch/i386/pci/ali1543.c:1.12
--- src/sys/arch/i386/pci/ali1543.c:1.11 Tue Dec 15 22:17:12 2009
+++ src/sys/arch/i386/pci/ali1543.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $ */
+/* $NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $ */
/*
* Copyright (c) 2001
@@ -84,7 +84,7 @@
/* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@
#include <sys/proc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/via82c586.c
diff -u src/sys/arch/i386/pci/via82c586.c:1.11 src/sys/arch/i386/pci/via82c586.c:1.12
--- src/sys/arch/i386/pci/via82c586.c:1.11 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/via82c586.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: via82c586.c,v 1.11 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: via82c586.c,v 1.12 2011/07/01 17:37:27 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,14 +60,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via82c586.c,v 1.11 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via82c586.c,v 1.12 2011/07/01 17:37:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/amd756.c
diff -u src/sys/arch/i386/pci/amd756.c:1.8 src/sys/arch/i386/pci/amd756.c:1.9
--- src/sys/arch/i386/pci/amd756.c:1.8 Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/pci/amd756.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $ */
+/* $NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.8 src/sys/arch/i386/pci/gcscehci.c:1.9
--- src/sys/arch/i386/pci/gcscehci.c:1.8 Tue May 25 08:37:10 2010
+++ src/sys/arch/i386/pci/gcscehci.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <dev/pci/pcidevs.h>
Index: src/sys/arch/i386/pci/geodecntr.c
diff -u src/sys/arch/i386/pci/geodecntr.c:1.8 src/sys/arch/i386/pci/geodecntr.c:1.9
--- src/sys/arch/i386/pci/geodecntr.c:1.8 Sat May 10 13:35:56 2008
+++ src/sys/arch/i386/pci/geodecntr.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: geodecntr.c,v 1.8 2008/05/10 13:35:56 jmcneill Exp $ */
+/* $NetBSD: geodecntr.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodecntr.c,v 1.8 2008/05/10 13:35:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodecntr.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@
#include <sys/device.h>
#include <machine/cpu.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/i386/pci/geodevar.h>
#include <arch/i386/pci/geodereg.h>
Index: src/sys/arch/i386/pci/elan520.c
diff -u src/sys/arch/i386/pci/elan520.c:1.48 src/sys/arch/i386/pci/elan520.c:1.49
--- src/sys/arch/i386/pci/elan520.c:1.48 Fri Feb 26 19:25:07 2010
+++ src/sys/arch/i386/pci/elan520.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: elan520.c,v 1.48 2010/02/26 19:25:07 jym Exp $ */
+/* $NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.48 2010/02/26 19:25:07 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <x86/nmi.h>
Index: src/sys/arch/i386/pci/pci_intr_fixup.c
diff -u src/sys/arch/i386/pci/pci_intr_fixup.c:1.48 src/sys/arch/i386/pci/pci_intr_fixup.c:1.49
--- src/sys/arch/i386/pci/pci_intr_fixup.c:1.48 Mon Jun 6 14:33:31 2011
+++ src/sys/arch/i386/pci/pci_intr_fixup.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_fixup.c,v 1.48 2011/06/06 14:33:31 msaitoh Exp $ */
+/* $NetBSD: pci_intr_fixup.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.48 2011/06/06 14:33:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $");
#include "opt_pcibios.h"
#include "opt_pcifixup.h"
@@ -72,7 +72,7 @@
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/geode.c
diff -u src/sys/arch/i386/pci/geode.c:1.14 src/sys/arch/i386/pci/geode.c:1.15
--- src/sys/arch/i386/pci/geode.c:1.14 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/i386/pci/geode.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: geode.c,v 1.15 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
@@ -64,14 +64,14 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.15 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/wdog.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <arch/i386/pci/geodevar.h>
Index: src/sys/arch/i386/pci/piix.c
diff -u src/sys/arch/i386/pci/piix.c:1.14 src/sys/arch/i386/pci/piix.c:1.15
--- src/sys/arch/i386/pci/piix.c:1.14 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/piix.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: piix.c,v 1.14 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: piix.c,v 1.15 2011/07/01 17:37:27 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piix.c,v 1.14 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piix.c,v 1.15 2011/07/01 17:37:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/geodewdg.c
diff -u src/sys/arch/i386/pci/geodewdg.c:1.10 src/sys/arch/i386/pci/geodewdg.c:1.11
--- src/sys/arch/i386/pci/geodewdg.c:1.10 Mon Oct 19 23:19:38 2009
+++ src/sys/arch/i386/pci/geodewdg.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
@@ -63,14 +63,14 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/wdog.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <arch/i386/pci/geodevar.h>
Index: src/sys/arch/i386/pci/gscpcib.c
diff -u src/sys/arch/i386/pci/gscpcib.c:1.15 src/sys/arch/i386/pci/gscpcib.c:1.16
--- src/sys/arch/i386/pci/gscpcib.c:1.15 Fri Jan 8 00:09:44 2010
+++ src/sys/arch/i386/pci/gscpcib.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gscpcib.c,v 1.15 2010/01/08 00:09:44 dyoung Exp $ */
+/* $NetBSD: gscpcib.c,v 1.16 2011/07/01 17:37:26 dyoung Exp $ */
/* $OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <gra...@openbsd.org>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.15 2010/01/08 00:09:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.16 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -31,7 +31,7 @@
#include <sys/gpio.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/i386/pci/opti82c558.c
diff -u src/sys/arch/i386/pci/opti82c558.c:1.9 src/sys/arch/i386/pci/opti82c558.c:1.10
--- src/sys/arch/i386/pci/opti82c558.c:1.9 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/opti82c558.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opti82c558.c,v 1.9 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: opti82c558.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.9 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/opti82c700.c
diff -u src/sys/arch/i386/pci/opti82c700.c:1.9 src/sys/arch/i386/pci/opti82c700.c:1.10
--- src/sys/arch/i386/pci/opti82c700.c:1.9 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/opti82c700.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opti82c700.c,v 1.9 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: opti82c700.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.9 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/sis85c503.c
diff -u src/sys/arch/i386/pci/sis85c503.c:1.9 src/sys/arch/i386/pci/sis85c503.c:1.10
--- src/sys/arch/i386/pci/sis85c503.c:1.9 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/sis85c503.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sis85c503.c,v 1.9 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: sis85c503.c,v 1.10 2011/07/01 17:37:27 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,14 +60,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sis85c503.c,v 1.9 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sis85c503.c,v 1.10 2011/07/01 17:37:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/i386/pci/pceb.c
diff -u src/sys/arch/i386/pci/pceb.c:1.23 src/sys/arch/i386/pci/pceb.c:1.24
--- src/sys/arch/i386/pci/pceb.c:1.23 Wed Apr 28 19:17:03 2010
+++ src/sys/arch/i386/pci/pceb.c Fri Jul 1 17:37:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pceb.c,v 1.23 2010/04/28 19:17:03 dyoung Exp $ */
+/* $NetBSD: pceb.c,v 1.24 2011/07/01 17:37:26 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.23 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.24 2011/07/01 17:37:26 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 <dev/isa/isavar.h>
#include <dev/eisa/eisavar.h>
Index: src/sys/arch/i386/pci/pcmb.c
diff -u src/sys/arch/i386/pci/pcmb.c:1.19 src/sys/arch/i386/pci/pcmb.c:1.20
--- src/sys/arch/i386/pci/pcmb.c:1.19 Wed Apr 28 19:17:04 2010
+++ src/sys/arch/i386/pci/pcmb.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmb.c,v 1.19 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: pcmb.c,v 1.20 2011/07/01 17:37:27 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -34,14 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.19 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.20 2011/07/01 17:37:27 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 <dev/mca/mcavar.h>
Index: src/sys/arch/i386/pci/piixpcib.c
diff -u src/sys/arch/i386/pci/piixpcib.c:1.20 src/sys/arch/i386/pci/piixpcib.c:1.21
--- src/sys/arch/i386/pci/piixpcib.c:1.20 Mon Apr 4 20:37:51 2011
+++ src/sys/arch/i386/pci/piixpcib.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.20 2011/04/04 20:37:51 dyoung Exp $ */
+/* $NetBSD: piixpcib.c,v 1.21 2011/07/01 17:37:27 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.20 2011/04/04 20:37:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.21 2011/07/01 17:37:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/bioscall.h>
Index: src/sys/arch/i386/pci/via8231.c
diff -u src/sys/arch/i386/pci/via8231.c:1.3 src/sys/arch/i386/pci/via8231.c:1.4
--- src/sys/arch/i386/pci/via8231.c:1.3 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pci/via8231.c Fri Jul 1 17:37:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: via8231.c,v 1.3 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: via8231.c,v 1.4 2011/07/01 17:37:27 dyoung Exp $ */
/* OpenBSD: via8231.c,v 1.6 2005/10/27 16:41:06 mickey Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via8231.c,v 1.3 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via8231.c,v 1.4 2011/07/01 17:37:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
