Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:03:51 UTC 2011
Modified Files:
src/sys/arch/evbppc/virtex: consinit.c dcr.c
src/sys/arch/evbppc/virtex/dev: pstwo.c tft.c tft_ll.c tft_plb.c
xcvbus.c xcvbusvar.h
src/sys/arch/evbppc/walnut: consinit.c
src/sys/arch/evbppc/walnut/dev: ds1743.c pbus.c pbusvar.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/virtex/consinit.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/virtex/dcr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/virtex/dev/pstwo.c \
src/sys/arch/evbppc/virtex/dev/tft.c \
src/sys/arch/evbppc/virtex/dev/tft_ll.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/dev/tft_plb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/virtex/dev/xcvbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/virtex/dev/xcvbusvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/walnut/consinit.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/walnut/dev/ds1743.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/walnut/dev/pbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/walnut/dev/pbusvar.h
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/virtex/consinit.c
diff -u src/sys/arch/evbppc/virtex/consinit.c:1.2 src/sys/arch/evbppc/virtex/consinit.c:1.3
--- src/sys/arch/evbppc/virtex/consinit.c:1.2 Wed Oct 17 19:54:20 2007
+++ src/sys/arch/evbppc/virtex/consinit.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.2 2007/10/17 19:54:20 garbled Exp $ */
+/* $NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -33,13 +33,13 @@
#include "xlcom.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.2 2007/10/17 19:54:20 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/virtex/virtex.h>
Index: src/sys/arch/evbppc/virtex/dcr.c
diff -u src/sys/arch/evbppc/virtex/dcr.c:1.1 src/sys/arch/evbppc/virtex/dcr.c:1.2
--- src/sys/arch/evbppc/virtex/dcr.c:1.1 Sat Dec 2 22:18:47 2006
+++ src/sys/arch/evbppc/virtex/dcr.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dcr.c,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* $NetBSD: dcr.c,v 1.2 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -37,10 +37,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dcr.c,v 1.1 2006/12/02 22:18:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dcr.c,v 1.2 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/virtex/dcr.h>
int
Index: src/sys/arch/evbppc/virtex/dev/pstwo.c
diff -u src/sys/arch/evbppc/virtex/dev/pstwo.c:1.3 src/sys/arch/evbppc/virtex/dev/pstwo.c:1.4
--- src/sys/arch/evbppc/virtex/dev/pstwo.c:1.3 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/dev/pstwo.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pstwo.c,v 1.3 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: pstwo.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pstwo.c,v 1.3 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pstwo.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
#include <sys/syslog.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pckbport/pckbportvar.h>
Index: src/sys/arch/evbppc/virtex/dev/tft.c
diff -u src/sys/arch/evbppc/virtex/dev/tft.c:1.3 src/sys/arch/evbppc/virtex/dev/tft.c:1.4
--- src/sys/arch/evbppc/virtex/dev/tft.c:1.3 Sun Feb 6 23:25:17 2011
+++ src/sys/arch/evbppc/virtex/dev/tft.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tft.c,v 1.3 2011/02/06 23:25:17 jmcneill Exp $ */
+/* $NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tft.c,v 1.3 2011/02/06 23:25:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tft.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbppc/virtex/dev/tft_ll.c
diff -u src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.3 src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.4
--- src/sys/arch/evbppc/virtex/dev/tft_ll.c:1.3 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/dev/tft_ll.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tft_ll.c,v 1.3 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: tft_ll.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1.3 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1.4 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* XXX needed? */
#include <dev/wscons/wsdisplayvar.h>
Index: src/sys/arch/evbppc/virtex/dev/tft_plb.c
diff -u src/sys/arch/evbppc/virtex/dev/tft_plb.c:1.4 src/sys/arch/evbppc/virtex/dev/tft_plb.c:1.5
--- src/sys/arch/evbppc/virtex/dev/tft_plb.c:1.4 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/dev/tft_plb.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tft_plb.c,v 1.4 2011/06/18 06:44:27 matt Exp $ */
+/* $NetBSD: tft_plb.c,v 1.5 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tft_plb.c,v 1.4 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tft_plb.c,v 1.5 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbppc/virtex/dev/xcvbus.c
diff -u src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.2 src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.3
--- src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.2 Mon Jun 6 16:42:18 2011
+++ src/sys/arch/evbppc/virtex/dev/xcvbus.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $ */
+/* $NetBSD: xcvbus.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.3 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
#include <evbppc/virtex/dev/xcvbusvar.h>
Index: src/sys/arch/evbppc/virtex/dev/xcvbusvar.h
diff -u src/sys/arch/evbppc/virtex/dev/xcvbusvar.h:1.1 src/sys/arch/evbppc/virtex/dev/xcvbusvar.h:1.2
--- src/sys/arch/evbppc/virtex/dev/xcvbusvar.h:1.1 Sat Dec 2 22:18:47 2006
+++ src/sys/arch/evbppc/virtex/dev/xcvbusvar.h Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xcvbusvar.h,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* $NetBSD: xcvbusvar.h,v 1.2 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifndef _VIRTEX_DEV_VIRTEXVAR_H_
#define _VIRTEX_DEV_VIRTEXVAR_H_
Index: src/sys/arch/evbppc/walnut/consinit.c
diff -u src/sys/arch/evbppc/walnut/consinit.c:1.7 src/sys/arch/evbppc/walnut/consinit.c:1.8
--- src/sys/arch/evbppc/walnut/consinit.c:1.7 Sun Dec 11 12:17:13 2005
+++ src/sys/arch/evbppc/walnut/consinit.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.7 2005/12/11 12:17:13 christos Exp $ */
+/* $NetBSD: consinit.c,v 1.8 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2005/12/11 12:17:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 19:03:50 dyoung Exp $");
#include "opt_kgdb.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ibm4xx/ibm405gp.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
Index: src/sys/arch/evbppc/walnut/dev/ds1743.c
diff -u src/sys/arch/evbppc/walnut/dev/ds1743.c:1.8 src/sys/arch/evbppc/walnut/dev/ds1743.c:1.9
--- src/sys/arch/evbppc/walnut/dev/ds1743.c:1.8 Wed Jun 15 05:29:32 2011
+++ src/sys/arch/evbppc/walnut/dev/ds1743.c Fri Jul 1 19:03:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1743.c,v 1.8 2011/06/15 05:29:32 cliff Exp $ */
+/* $NetBSD: ds1743.c,v 1.9 2011/07/01 19:03:50 dyoung Exp $ */
/*
* Copyright (c) 2001-2002 Wasabi Sysetms, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1743.c,v 1.8 2011/06/15 05:29:32 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1743.c,v 1.9 2011/07/01 19:03:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <dev/clock_subr.h>
#include <machine/rtc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/walnut/dev/ds1743reg.h>
#include <evbppc/walnut/dev/pbusvar.h>
Index: src/sys/arch/evbppc/walnut/dev/pbus.c
diff -u src/sys/arch/evbppc/walnut/dev/pbus.c:1.12 src/sys/arch/evbppc/walnut/dev/pbus.c:1.13
--- src/sys/arch/evbppc/walnut/dev/pbus.c:1.12 Wed Jun 15 05:21:38 2011
+++ src/sys/arch/evbppc/walnut/dev/pbus.c Fri Jul 1 19:03:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $ */
+/* $NetBSD: pbus.c,v 1.13 2011/07/01 19:03:51 dyoung Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.13 2011/07/01 19:03:51 dyoung Exp $");
#include "locators.h"
#include "pckbc.h"
@@ -75,7 +75,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/walnut.h>
#include <evbppc/walnut/dev/pbusvar.h>
Index: src/sys/arch/evbppc/walnut/dev/pbusvar.h
diff -u src/sys/arch/evbppc/walnut/dev/pbusvar.h:1.1 src/sys/arch/evbppc/walnut/dev/pbusvar.h:1.2
--- src/sys/arch/evbppc/walnut/dev/pbusvar.h:1.1 Mon Dec 9 12:16:24 2002
+++ src/sys/arch/evbppc/walnut/dev/pbusvar.h Fri Jul 1 19:03:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pbusvar.h,v 1.1 2002/12/09 12:16:24 scw Exp $ */
+/* $NetBSD: pbusvar.h,v 1.2 2011/07/01 19:03:51 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct pbus_attach_args {
const char *pb_name;
