Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:52:02 UTC 2011
Modified Files:
src/sys/arch/prep/eisa: eisa_machdep.c
src/sys/arch/prep/prep: consinit.c cpu.c mainbus.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/eisa/eisa_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/prep/prep/consinit.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/prep/prep/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/prep/prep/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/prep/eisa/eisa_machdep.c
diff -u src/sys/arch/prep/eisa/eisa_machdep.c:1.3 src/sys/arch/prep/eisa/eisa_machdep.c:1.4
--- src/sys/arch/prep/eisa/eisa_machdep.c:1.3 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/eisa/eisa_machdep.c Fri Jul 1 20:52:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa_machdep.c,v 1.3 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: eisa_machdep.c,v 1.4 2011/07/01 20:52:02 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.3 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.4 2011/07/01 20:52:02 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -76,7 +76,7 @@
#include <sys/extent.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/intr.h>
Index: src/sys/arch/prep/prep/consinit.c
diff -u src/sys/arch/prep/prep/consinit.c:1.6 src/sys/arch/prep/prep/consinit.c:1.7
--- src/sys/arch/prep/prep/consinit.c:1.6 Wed Oct 17 19:56:53 2007
+++ src/sys/arch/prep/prep/consinit.c Fri Jul 1 20:52:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.6 2007/10/17 19:56:53 garbled Exp $ */
+/* $NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,13 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.6 2007/10/17 19:56:53 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2011/07/01 20:52:02 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/cons.h>
Index: src/sys/arch/prep/prep/cpu.c
diff -u src/sys/arch/prep/prep/cpu.c:1.17 src/sys/arch/prep/prep/cpu.c:1.18
--- src/sys/arch/prep/prep/cpu.c:1.17 Wed Jun 29 06:13:09 2011
+++ src/sys/arch/prep/prep/cpu.c Fri Jul 1 20:52:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.17 2011/06/29 06:13:09 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.18 2011/07/01 20:52:02 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.17 2011/06/29 06:13:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18 2011/07/01 20:52:02 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/prep/prep/mainbus.c
diff -u src/sys/arch/prep/prep/mainbus.c:1.31 src/sys/arch/prep/prep/mainbus.c:1.32
--- src/sys/arch/prep/prep/mainbus.c:1.31 Sun Jun 5 17:03:17 2011
+++ src/sys/arch/prep/prep/mainbus.c Fri Jul 1 20:52:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.31 2011/06/05 17:03:17 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 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.31 2011/06/05 17:03:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2011/07/01 20:52:02 dyoung Exp $");
#include "opt_pci.h"
#include "opt_residual.h"
@@ -47,7 +47,7 @@
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <dev/pci/pcivar.h>
