Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:48:23 UTC 2011
Modified Files:
src/sys/arch/iyonix/iyonix: com_obio.c i80321_mainbus.c
iyonix_machdep.c iyonix_pci.c obio.c obio_space.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/iyonix/iyonix/com_obio.c \
src/sys/arch/iyonix/iyonix/obio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/iyonix/iyonix/i80321_mainbus.c \
src/sys/arch/iyonix/iyonix/obio_space.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/iyonix/iyonix/iyonix_pci.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/iyonix/iyonix/com_obio.c
diff -u src/sys/arch/iyonix/iyonix/com_obio.c:1.5 src/sys/arch/iyonix/iyonix/com_obio.c:1.6
--- src/sys/arch/iyonix/iyonix/com_obio.c:1.5 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/iyonix/iyonix/com_obio.c Fri Jul 1 20:48:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2011/07/01 20:48:22 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: src/sys/arch/iyonix/iyonix/obio.c
diff -u src/sys/arch/iyonix/iyonix/obio.c:1.5 src/sys/arch/iyonix/iyonix/obio.c:1.6
--- src/sys/arch/iyonix/iyonix/obio.c:1.5 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/iyonix/iyonix/obio.c Fri Jul 1 20:48:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.6 2011/07/01 20:48:23 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 <arm/xscale/i80321reg.h>
Index: src/sys/arch/iyonix/iyonix/i80321_mainbus.c
diff -u src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.5
--- src/sys/arch/iyonix/iyonix/i80321_mainbus.c:1.4 Sun May 14 15:26:05 2006
+++ src/sys/arch/iyonix/iyonix/i80321_mainbus.c Fri Jul 1 20:48:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $ */
+/* $NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.4 2006/05/14 15:26:05 gavan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.5 2011/07/01 20:48:23 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 <iyonix/iyonix/iyonixreg.h>
#include <iyonix/iyonix/iyonixvar.h>
Index: src/sys/arch/iyonix/iyonix/obio_space.c
diff -u src/sys/arch/iyonix/iyonix/obio_space.c:1.4 src/sys/arch/iyonix/iyonix/obio_space.c:1.5
--- src/sys/arch/iyonix/iyonix/obio_space.c:1.4 Sat Nov 7 07:27:44 2009
+++ src/sys/arch/iyonix/iyonix/obio_space.c Fri Jul 1 20:48:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $ */
+/* $NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.4 2009/11/07 07:27:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.5 2011/07/01 20:48:23 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.18
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.17 Thu Jun 30 20:09:32 2011
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Fri Jul 1 20:48:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.17 2011/06/30 20:09:32 wiz Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.18 2011/07/01 20:48:23 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.17 2011/06/30 20:09:32 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.18 2011/07/01 20:48:23 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -102,7 +102,7 @@
#include <ddb/db_extern.h>
#include <acorn32/include/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/iyonix/iyonix/iyonix_pci.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.6 src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.7
--- src/sys/arch/iyonix/iyonix/iyonix_pci.c:1.6 Wed Apr 6 01:48:43 2011
+++ src/sys/arch/iyonix/iyonix/iyonix_pci.c Fri Jul 1 20:48:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_pci.c,v 1.6 2011/04/06 01:48:43 dyoung Exp $ */
+/* $NetBSD: iyonix_pci.c,v 1.7 2011/07/01 20:48:23 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_pci.c,v 1.6 2011/04/06 01:48:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_pci.c,v 1.7 2011/07/01 20:48:23 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 <iyonix/iyonix/iyonixreg.h>
#include <iyonix/iyonix/iyonixvar.h>
