Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:22:08 UTC 2011
Modified Files:
src/sys/arch/x86/pci: agp_machdep.c amdpcib_hpet.c fwhrng.c ichlpcib.c
ichlpcib_hpet.c pchb.c pci_addr_fixup.c pci_bus_fixup.c pcib.c
rdcpcib.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/agp_machdep.c \
src/sys/arch/x86/pci/pci_bus_fixup.c src/sys/arch/x86/pci/rdcpcib.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/pci/amdpcib_hpet.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/fwhrng.c \
src/sys/arch/x86/pci/ichlpcib_hpet.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/pci/pci_addr_fixup.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/pci/pcib.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/x86/pci/agp_machdep.c
diff -u src/sys/arch/x86/pci/agp_machdep.c:1.1 src/sys/arch/x86/pci/agp_machdep.c:1.2
--- src/sys/arch/x86/pci/agp_machdep.c:1.1 Mon Dec 18 12:11:33 2006
+++ src/sys/arch/x86/pci/agp_machdep.c Fri Jul 1 18:22:08 2011
@@ -1,13 +1,13 @@
-/* $NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $ */
+/* $NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.1 2006/12/18 12:11:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_machdep.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/types.h>
#include <sys/device.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/x86/pci/pci_bus_fixup.c
diff -u src/sys/arch/x86/pci/pci_bus_fixup.c:1.1 src/sys/arch/x86/pci/pci_bus_fixup.c:1.2
--- src/sys/arch/x86/pci/pci_bus_fixup.c:1.1 Sun May 18 02:06:14 2008
+++ src/sys/arch/x86/pci/pci_bus_fixup.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $ */
+/* $NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */
/*
* Copyright (c) 1999, by UCHIYAMA Yasushi
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_bus_fixup.c,v 1.1 2008/05/18 02:06:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_bus_fixup.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.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/x86/pci/rdcpcib.c
diff -u src/sys/arch/x86/pci/rdcpcib.c:1.1 src/sys/arch/x86/pci/rdcpcib.c:1.2
--- src/sys/arch/x86/pci/rdcpcib.c:1.1 Mon Apr 4 17:09:39 2011
+++ src/sys/arch/x86/pci/rdcpcib.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $ */
+/* $NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v 1.2 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/sysctl.h>
#include <sys/timetc.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/x86/pci/amdpcib_hpet.c
diff -u src/sys/arch/x86/pci/amdpcib_hpet.c:1.7 src/sys/arch/x86/pci/amdpcib_hpet.c:1.8
--- src/sys/arch/x86/pci/amdpcib_hpet.c:1.7 Wed Jun 15 08:19:43 2011
+++ src/sys/arch/x86/pci/amdpcib_hpet.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $ */
+/* $NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpcib_hpet.c,v 1.7 2011/06/15 08:19:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpcib_hpet.c,v 1.8 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -37,7 +37,7 @@
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/x86/pci/fwhrng.c
diff -u src/sys/arch/x86/pci/fwhrng.c:1.2 src/sys/arch/x86/pci/fwhrng.c:1.3
--- src/sys/arch/x86/pci/fwhrng.c:1.2 Mon Aug 23 02:57:19 2010
+++ src/sys/arch/x86/pci/fwhrng.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $ */
+/* $NetBSD: fwhrng.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $");
#include "rnd.h"
@@ -43,7 +43,7 @@
#include <sys/time.h>
#include <sys/rnd.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/x86/pci/i82802reg.h>
Index: src/sys/arch/x86/pci/ichlpcib_hpet.c
diff -u src/sys/arch/x86/pci/ichlpcib_hpet.c:1.2 src/sys/arch/x86/pci/ichlpcib_hpet.c:1.3
--- src/sys/arch/x86/pci/ichlpcib_hpet.c:1.2 Wed Jun 15 08:19:43 2011
+++ src/sys/arch/x86/pci/ichlpcib_hpet.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib_hpet.c,v 1.2 2011/06/15 08:19:43 jruoho Exp $ */
+/* $NetBSD: ichlpcib_hpet.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -29,15 +29,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib_hpet.c,v 1.2 2011/06/15 08:19:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib_hpet.c,v 1.3 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
-
#include <dev/ic/hpetreg.h>
#include <dev/ic/hpetvar.h>
#include <dev/ic/i82801lpcreg.h>
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.31 src/sys/arch/x86/pci/ichlpcib.c:1.32
--- src/sys/arch/x86/pci/ichlpcib.c:1.31 Wed Jun 15 06:43:20 2011
+++ src/sys/arch/x86/pci/ichlpcib.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.31 2011/06/15 06:43:20 jruoho Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.32 2011/07/01 18:22:08 dyoung Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.31 2011/06/15 06:43:20 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.32 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,7 +48,7 @@
#include <sys/sysctl.h>
#include <sys/timetc.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/x86/pci/pchb.c
diff -u src/sys/arch/x86/pci/pchb.c:1.25 src/sys/arch/x86/pci/pchb.c:1.26
--- src/sys/arch/x86/pci/pchb.c:1.25 Tue May 17 17:34:53 2011
+++ src/sys/arch/x86/pci/pchb.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.25 2011/05/17 17:34:53 dyoung Exp $ */
+/* $NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.25 2011/05/17 17:34:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 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/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/x86/pci/pci_addr_fixup.c
diff -u src/sys/arch/x86/pci/pci_addr_fixup.c:1.5 src/sys/arch/x86/pci/pci_addr_fixup.c:1.6
--- src/sys/arch/x86/pci/pci_addr_fixup.c:1.5 Mon Jul 26 22:33:23 2010
+++ src/sys/arch/x86/pci/pci_addr_fixup.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $ */
+/* $NetBSD: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $ */
/*-
* Copyright (c) 2000 UCHIYAMA Yasushi. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.6 2011/07/01 18:22:08 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@
#include <sys/device.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/x86/pci/pcib.c
diff -u src/sys/arch/x86/pci/pcib.c:1.12 src/sys/arch/x86/pci/pcib.c:1.13
--- src/sys/arch/x86/pci/pcib.c:1.12 Wed Apr 28 19:17:04 2010
+++ src/sys/arch/x86/pci/pcib.c Fri Jul 1 18:22:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.12 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.12 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2011/07/01 18:22:08 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>
