Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:34:53 UTC 2011
Modified Files:
src/sys/arch/bebox/bebox: cpu.c mainbus.c
src/sys/arch/bebox/isa: mcclock_isa.c
src/sys/arch/bebox/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.10 -r1.11 src/sys/arch/bebox/bebox/cpu.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/bebox/bebox/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/bebox/isa/mcclock_isa.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/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/bebox/bebox/cpu.c
diff -u src/sys/arch/bebox/bebox/cpu.c:1.10 src/sys/arch/bebox/bebox/cpu.c:1.11
--- src/sys/arch/bebox/bebox/cpu.c:1.10 Fri Jun 3 00:16:27 2011
+++ src/sys/arch/bebox/bebox/cpu.c Fri Jul 1 20:34:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.10 2011/06/03 00:16:27 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.11 2011/07/01 20:34:52 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.10 2011/06/03 00:16:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2011/07/01 20:34:52 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>
int cpumatch(device_t, cfdata_t, void *);
Index: src/sys/arch/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.26 src/sys/arch/bebox/bebox/mainbus.c:1.27
--- src/sys/arch/bebox/bebox/mainbus.c:1.26 Fri Jun 3 00:16:27 2011
+++ src/sys/arch/bebox/bebox/mainbus.c Fri Jul 1 20:34:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.26 2011/06/03 00:16:27 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.27 2011/07/01 20:34:53 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.26 2011/06/03 00:16:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.27 2011/07/01 20:34:53 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/bebox/isa/mcclock_isa.c
diff -u src/sys/arch/bebox/isa/mcclock_isa.c:1.4 src/sys/arch/bebox/isa/mcclock_isa.c:1.5
--- src/sys/arch/bebox/isa/mcclock_isa.c:1.4 Sat Mar 29 05:42:45 2008
+++ src/sys/arch/bebox/isa/mcclock_isa.c Fri Jul 1 20:34:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.5 2011/07/01 20:34:53 dyoung Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.5 2011/07/01 20:34:53 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@
#include <sys/device.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/bebox/pci/pci_machdep.c
diff -u src/sys/arch/bebox/pci/pci_machdep.c:1.20 src/sys/arch/bebox/pci/pci_machdep.c:1.21
--- src/sys/arch/bebox/pci/pci_machdep.c:1.20 Thu Jun 30 00:52:56 2011
+++ src/sys/arch/bebox/pci/pci_machdep.c Fri Jul 1 20:34:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.20 2011/06/30 00:52:56 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.21 2011/07/01 20:34:53 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.20 2011/06/30 00:52:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.21 2011/07/01 20:34:53 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 <powerpc/pio.h>
