Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:49:38 UTC 2011
Modified Files:
src/sys/arch/mvmeppc/mvmeppc: cpu.c mainbus.c
src/sys/arch/mvmeppc/pci: pci_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/mvmeppc/cpu.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvmeppc/pci/pci_machdep.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/mvmeppc/mvmeppc/cpu.c
diff -u src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.9 src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.10
--- src/sys/arch/mvmeppc/mvmeppc/cpu.c:1.9 Sun Jun 5 17:03:16 2011
+++ src/sys/arch/mvmeppc/mvmeppc/cpu.c Fri Jul 1 20:49:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/platform.h>
Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.13 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.14
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.13 Sun Jun 5 17:03:16 2011
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Fri Jul 1 20:49:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2011/07/01 20:49:38 dyoung Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -40,7 +40,7 @@
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "pci.h"
#include "opt_pci.h"
Index: src/sys/arch/mvmeppc/pci/pci_machdep.c
diff -u src/sys/arch/mvmeppc/pci/pci_machdep.c:1.9 src/sys/arch/mvmeppc/pci/pci_machdep.c:1.10
--- src/sys/arch/mvmeppc/pci/pci_machdep.c:1.9 Thu Jun 30 00:52:58 2011
+++ src/sys/arch/mvmeppc/pci/pci_machdep.c Fri Jul 1 20:49:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.9 2011/06/30 00:52:58 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.10 2011/07/01 20:49:38 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.9 2011/06/30 00:52:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -49,7 +49,7 @@
#include <sys/device.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
