Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:46:39 UTC 2011
Modified Files:
src/sys/arch/evbppc/ev64260: com_obio.c gt_mainbus.c
src/sys/arch/evbppc/evbppc: evbppc_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/evbppc/ev64260/com_obio.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/ev64260/gt_mainbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/evbppc/evbppc_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/evbppc/ev64260/com_obio.c
diff -u src/sys/arch/evbppc/ev64260/com_obio.c:1.10 src/sys/arch/evbppc/ev64260/com_obio.c:1.11
--- src/sys/arch/evbppc/ev64260/com_obio.c:1.10 Wed Apr 28 13:51:55 2010
+++ src/sys/arch/evbppc/ev64260/com_obio.c Fri Jul 1 20:46:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.10 2010/04/28 13:51:55 kiyohara Exp $ */
+/* $NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.10 2010/04/28 13:51:55 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/evbppc/ev64260/gt_mainbus.c
diff -u src/sys/arch/evbppc/ev64260/gt_mainbus.c:1.16 src/sys/arch/evbppc/ev64260/gt_mainbus.c:1.17
--- src/sys/arch/evbppc/ev64260/gt_mainbus.c:1.16 Wed Jun 2 06:44:33 2010
+++ src/sys/arch/evbppc/ev64260/gt_mainbus.c Fri Jul 1 20:46:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gt_mainbus.c,v 1.16 2010/06/02 06:44:33 kiyohara Exp $ */
+/* $NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.16 2010/06/02 06:44:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $");
#include "opt_ev64260.h"
#include "opt_pci.h"
@@ -49,7 +49,7 @@
#include <sys/extent.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "opt_pci.h"
#include <dev/pci/pcivar.h>
Index: src/sys/arch/evbppc/evbppc/evbppc_machdep.c
diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.12 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.13
--- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.12 Thu Jun 30 00:52:56 2011
+++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Fri Jul 1 20:46:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evbppc_machdep.c,v 1.12 2011/06/30 00:52:56 matt Exp $ */
+/* $NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.12 2011/06/30 00:52:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/*
