Module Name: src
Committed By: dyoung
Date: Fri Jul 1 16:56:52 UTC 2011
Modified Files:
src/sys/arch/prep/pci: gten.c pceb.c pci_machdep.c
prep_pciconf_direct.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/prep/pci/gten.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/pci/pceb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/prep/pci/pci_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/pci/prep_pciconf_direct.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/prep/pci/gten.c
diff -u src/sys/arch/prep/pci/gten.c:1.19 src/sys/arch/prep/pci/gten.c:1.20
--- src/sys/arch/prep/pci/gten.c:1.19 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/pci/gten.c Fri Jul 1 16:56:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -51,7 +51,7 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/gtenvar.h>
static int gten_match(device_t, cfdata_t, void *);
Index: src/sys/arch/prep/pci/pceb.c
diff -u src/sys/arch/prep/pci/pceb.c:1.5 src/sys/arch/prep/pci/pceb.c:1.6
--- src/sys/arch/prep/pci/pceb.c:1.5 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/pci/pceb.c Fri Jul 1 16:56:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pceb.c,v 1.5 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 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.5 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 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/prep/pci/pci_machdep.c
diff -u src/sys/arch/prep/pci/pci_machdep.c:1.36 src/sys/arch/prep/pci/pci_machdep.c:1.37
--- src/sys/arch/prep/pci/pci_machdep.c:1.36 Thu Jun 30 00:53:00 2011
+++ src/sys/arch/prep/pci/pci_machdep.c Fri Jul 1 16:56:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -53,7 +53,7 @@
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
#include <machine/pnp.h>
Index: src/sys/arch/prep/pci/prep_pciconf_direct.c
diff -u src/sys/arch/prep/pci/prep_pciconf_direct.c:1.7 src/sys/arch/prep/pci/prep_pciconf_direct.c:1.8
--- src/sys/arch/prep/pci/prep_pciconf_direct.c:1.7 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/pci/prep_pciconf_direct.c Fri Jul 1 16:56:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $ */
/*
* Copyright (c) 2002 Klaus J. Klein. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,7 +51,7 @@
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
