Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:16:06 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: com_eumb.c eumb.c eumbvar.h
iic_eumb.c mainbus.c satmgr.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/sandpoint/com_eumb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/sandpoint/eumbvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sandpoint/sandpoint/iic_eumb.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/sandpoint/satmgr.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/sandpoint/sandpoint/com_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.6 src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.7
--- src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.6 Thu Feb 24 19:32:34 2011
+++ src/sys/arch/sandpoint/sandpoint/com_eumb.c Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_eumb.c,v 1.6 2011/02/24 19:32:34 phx Exp $ */
+/* $NetBSD: com_eumb.c,v 1.7 2011/07/01 19:16:06 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.6 2011/02/24 19:32:34 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.7 2011/07/01 19:16:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/sandpoint/sandpoint/eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/eumb.c:1.4 src/sys/arch/sandpoint/sandpoint/eumb.c:1.5
--- src/sys/arch/sandpoint/sandpoint/eumb.c:1.4 Mon Jun 6 16:42:19 2011
+++ src/sys/arch/sandpoint/sandpoint/eumb.c Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $ */
+/* $NetBSD: eumb.c,v 1.5 2011/07/01 19:16:06 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.5 2011/07/01 19:16:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sandpoint/sandpoint/eumbvar.h>
Index: src/sys/arch/sandpoint/sandpoint/eumbvar.h
diff -u src/sys/arch/sandpoint/sandpoint/eumbvar.h:1.5 src/sys/arch/sandpoint/sandpoint/eumbvar.h:1.6
--- src/sys/arch/sandpoint/sandpoint/eumbvar.h:1.5 Wed May 12 17:20:24 2010
+++ src/sys/arch/sandpoint/sandpoint/eumbvar.h Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eumbvar.h,v 1.5 2010/05/12 17:20:24 phx Exp $ */
+/* $NetBSD: eumbvar.h,v 1.6 2011/07/01 19:16:06 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct eumb_attach_args {
const char *eumb_name;
Index: src/sys/arch/sandpoint/sandpoint/iic_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.15 src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.16
--- src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.15 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/sandpoint/sandpoint/iic_eumb.c Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iic_eumb.c,v 1.15 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: iic_eumb.c,v 1.16 2011/07/01 19:16:06 dyoung Exp $ */
/*-
* Copyright (c) 2010,2011 Frank Wille.
@@ -29,12 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iic_eumb.c,v 1.15 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iic_eumb.c,v 1.16 2011/07/01 19:16:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/motoi2cvar.h>
#include <sandpoint/sandpoint/eumbvar.h>
#include <machine/bootinfo.h>
Index: src/sys/arch/sandpoint/sandpoint/mainbus.c
diff -u src/sys/arch/sandpoint/sandpoint/mainbus.c:1.23 src/sys/arch/sandpoint/sandpoint/mainbus.c:1.24
--- src/sys/arch/sandpoint/sandpoint/mainbus.c:1.23 Sun Jun 5 17:03:19 2011
+++ src/sys/arch/sandpoint/sandpoint/mainbus.c Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.23 2011/06/05 17:03:19 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.24 2011/07/01 19:16:06 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2011/06/05 17:03:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2011/07/01 19:16:06 dyoung Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -42,7 +42,7 @@
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.11 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.12
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.11 Tue Apr 19 18:16:03 2011
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Fri Jul 1 19:16:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.11 2011/04/19 18:16:03 phx Exp $ */
+/* $NetBSD: satmgr.c,v 1.12 2011/07/01 19:16:06 dyoung Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
#include <dev/ic/comreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/bootinfo.h>
