Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:47:43 UTC 2011
Modified Files:
src/sys/arch/ibmnws/ibmnws: consinit.c cpu.c mainbus.c
src/sys/arch/ibmnws/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.4 -r1.5 src/sys/arch/ibmnws/ibmnws/consinit.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ibmnws/ibmnws/cpu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ibmnws/ibmnws/mainbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ibmnws/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/ibmnws/ibmnws/consinit.c
diff -u src/sys/arch/ibmnws/ibmnws/consinit.c:1.4 src/sys/arch/ibmnws/ibmnws/consinit.c:1.5
--- src/sys/arch/ibmnws/ibmnws/consinit.c:1.4 Thu May 15 23:38:49 2008
+++ src/sys/arch/ibmnws/ibmnws/consinit.c Fri Jul 1 20:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.4 2008/05/15 23:38:49 rjs Exp $ */
+/* $NetBSD: consinit.c,v 1.5 2011/07/01 20:47:43 dyoung Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/cons.h>
Index: src/sys/arch/ibmnws/ibmnws/cpu.c
diff -u src/sys/arch/ibmnws/ibmnws/cpu.c:1.6 src/sys/arch/ibmnws/ibmnws/cpu.c:1.7
--- src/sys/arch/ibmnws/ibmnws/cpu.c:1.6 Mon Nov 3 15:13:16 2008
+++ src/sys/arch/ibmnws/ibmnws/cpu.c Fri Jul 1 20:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.6 2008/11/03 15:13:16 rjs Exp $ */
+/* $NetBSD: cpu.c,v 1.7 2011/07/01 20:47:43 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#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/ibmnws/ibmnws/mainbus.c
diff -u src/sys/arch/ibmnws/ibmnws/mainbus.c:1.9 src/sys/arch/ibmnws/ibmnws/mainbus.c:1.10
--- src/sys/arch/ibmnws/ibmnws/mainbus.c:1.9 Tue May 17 17:34:50 2011
+++ src/sys/arch/ibmnws/ibmnws/mainbus.c Fri Jul 1 20:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.9 2011/05/17 17:34:50 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.10 2011/07/01 20:47:43 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -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 <dev/pci/pcivar.h>
Index: src/sys/arch/ibmnws/pci/pci_machdep.c
diff -u src/sys/arch/ibmnws/pci/pci_machdep.c:1.8 src/sys/arch/ibmnws/pci/pci_machdep.c:1.9
--- src/sys/arch/ibmnws/pci/pci_machdep.c:1.8 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/ibmnws/pci/pci_machdep.c Fri Jul 1 20:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.8 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.9 2011/07/01 20:47:43 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -49,7 +49,7 @@
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
