Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:03:09 UTC 2011
Modified Files:
src/sys/arch/evbppc/pmppc: mainbus.c pic_cpc700.c
src/sys/arch/evbppc/pmppc/dev: cpc_mainbus.c ds17485.c flash.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/evbppc/pmppc/mainbus.c \
src/sys/arch/evbppc/pmppc/pic_cpc700.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/dev/ds17485.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/pmppc/dev/flash.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/pmppc/mainbus.c
diff -u src/sys/arch/evbppc/pmppc/mainbus.c:1.5 src/sys/arch/evbppc/pmppc/mainbus.c:1.6
--- src/sys/arch/evbppc/pmppc/mainbus.c:1.5 Sat Jun 18 08:08:27 2011
+++ src/sys/arch/evbppc/pmppc/mainbus.c Fri Jul 1 19:03:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2011/06/18 08:08:27 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.6 2011/07/01 19:03:08 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2011/06/18 08:08:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2011/07/01 19:03:08 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmppc.h>
#include <arch/evbppc/pmppc/dev/mainbus.h>
Index: src/sys/arch/evbppc/pmppc/pic_cpc700.c
diff -u src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.5 src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.6
--- src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.5 Mon Dec 20 00:25:32 2010
+++ src/sys/arch/evbppc/pmppc/pic_cpc700.c Fri Jul 1 19:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_cpc700.c,v 1.5 2010/12/20 00:25:32 matt Exp $ */
+/* $NetBSD: pic_cpc700.c,v 1.6 2011/07/01 19:03:09 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.5 2010/12/20 00:25:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.6 2011/07/01 19:03:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -38,7 +38,7 @@
#include <machine/pio.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
diff -u src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.5 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.6
--- src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.5 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c Fri Jul 1 19:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc_mainbus.c,v 1.5 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: cpc_mainbus.c,v 1.6 2011/07/01 19:03:09 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.5 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.6 2011/07/01 19:03:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -38,7 +38,7 @@
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
#include <dev/pci/pcivar.h>
Index: src/sys/arch/evbppc/pmppc/dev/ds17485.c
diff -u src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.7 src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.8
--- src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.7 Thu Dec 9 04:31:57 2010
+++ src/sys/arch/evbppc/pmppc/dev/ds17485.c Fri Jul 1 19:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $ */
+/* $NetBSD: ds17485.c,v 1.8 2011/07/01 19:03:09 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds17485.c,v 1.8 2011/07/01 19:03:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,7 +159,7 @@
#include <machine/cpu.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: src/sys/arch/evbppc/pmppc/dev/flash.c
diff -u src/sys/arch/evbppc/pmppc/dev/flash.c:1.4 src/sys/arch/evbppc/pmppc/dev/flash.c:1.5
--- src/sys/arch/evbppc/pmppc/dev/flash.c:1.4 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/pmppc/dev/flash.c Fri Jul 1 19:03:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.4 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: flash.c,v 1.5 2011/07/01 19:03:09 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.4 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.5 2011/07/01 19:03:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/evbppc/pmppc/dev/mainbus.h>
struct flash_softc {
