Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:51:15 UTC 2011
Modified Files:
src/sys/arch/ofppc/isa: isa_machdep.c
src/sys/arch/ofppc/ofppc: machdep.c
src/sys/arch/ofppc/pci: gt_mainbus.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ofppc/isa/isa_machdep.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ofppc/pci/gt_mainbus.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/ofppc/isa/isa_machdep.c
diff -u src/sys/arch/ofppc/isa/isa_machdep.c:1.5 src/sys/arch/ofppc/isa/isa_machdep.c:1.6
--- src/sys/arch/ofppc/isa/isa_machdep.c:1.5 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/ofppc/isa/isa_machdep.c Fri Jul 1 20:51:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.5 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.6 2011/07/01 20:51:14 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.5 2008/04/28 20:23:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.6 2011/07/01 20:51:14 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <sys/extent.h>
Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.114 src/sys/arch/ofppc/ofppc/machdep.c:1.115
--- src/sys/arch/ofppc/ofppc/machdep.c:1.114 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/ofppc/ofppc/machdep.c Fri Jul 1 20:51:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.114 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/pmap.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <powerpc/spr.h>
Index: src/sys/arch/ofppc/pci/gt_mainbus.c
diff -u src/sys/arch/ofppc/pci/gt_mainbus.c:1.3 src/sys/arch/ofppc/pci/gt_mainbus.c:1.4
--- src/sys/arch/ofppc/pci/gt_mainbus.c:1.3 Fri Dec 17 19:18:49 2010
+++ src/sys/arch/ofppc/pci/gt_mainbus.c Fri Jul 1 20:51:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $ */
+/* $NetBSD: gt_mainbus.c,v 1.4 2011/07/01 20:51:15 dyoung Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.4 2011/07/01 20:51:15 dyoung Exp $");
#include "opt_pci.h"
#include "opt_marvell.h"
@@ -43,7 +43,7 @@
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <machine/pegasosreg.h>
