Module Name: src
Committed By: dyoung
Date: Fri Jul 1 16:55:42 UTC 2011
Modified Files:
src/sys/arch/prep/pnpbus: fdc_pnpbus.c if_we_pnpbus.c mcclock_pnpbus.c
mkclock_pnpbus.c pnpbus.c pnpbusvar.h wdc_pnpbus.c
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/prep/pnpbus/fdc_pnpbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/prep/pnpbus/if_we_pnpbus.c \
src/sys/arch/prep/pnpbus/pnpbusvar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c \
src/sys/arch/prep/pnpbus/wdc_pnpbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/pnpbus/mkclock_pnpbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/pnpbus/pnpbus.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/prep/pnpbus/fdc_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.2 src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.3
--- src/sys/arch/prep/pnpbus/fdc_pnpbus.c:1.2 Tue Apr 29 06:53:02 2008
+++ src/sys/arch/prep/pnpbus/fdc_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $ */
+/* $NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $");
#include "rnd.h"
@@ -48,7 +48,7 @@
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
Index: src/sys/arch/prep/pnpbus/if_we_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.7 src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.8
--- src/sys/arch/prep/pnpbus/if_we_pnpbus.c:1.7 Sat Jun 18 08:08:29 2011
+++ src/sys/arch/prep/pnpbus/if_we_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -67,7 +67,7 @@
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: src/sys/arch/prep/pnpbus/pnpbusvar.h
diff -u src/sys/arch/prep/pnpbus/pnpbusvar.h:1.7 src/sys/arch/prep/pnpbus/pnpbusvar.h:1.8
--- src/sys/arch/prep/pnpbus/pnpbusvar.h:1.7 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/prep/pnpbus/pnpbusvar.h Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbusvar.h,v 1.7 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: pnpbusvar.h,v 1.8 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _PREP_PNPBUSVAR_H_
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/residual.h>
struct pnpbus_mem {
Index: src/sys/arch/prep/pnpbus/mcclock_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.9 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.10
--- src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.9 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pnpbus/mcclock_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -47,7 +47,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: src/sys/arch/prep/pnpbus/wdc_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.9 src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.10
--- src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.9 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pnpbus/wdc_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: wdc_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: src/sys/arch/prep/pnpbus/mkclock_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/mkclock_pnpbus.c:1.5 src/sys/arch/prep/pnpbus/mkclock_pnpbus.c:1.6
--- src/sys/arch/prep/pnpbus/mkclock_pnpbus.c:1.5 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pnpbus/mkclock_pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkclock_pnpbus.c,v 1.5 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: mkclock_pnpbus.c,v 1.6 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock_pnpbus.c,v 1.5 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock_pnpbus.c,v 1.6 2011/07/01 16:55:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/residual.h>
#include <machine/chpidpnp.h>
Index: src/sys/arch/prep/pnpbus/pnpbus.c
diff -u src/sys/arch/prep/pnpbus/pnpbus.c:1.10 src/sys/arch/prep/pnpbus/pnpbus.c:1.11
--- src/sys/arch/prep/pnpbus/pnpbus.c:1.10 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/prep/pnpbus/pnpbus.c Fri Jul 1 16:55:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbus.c,v 1.10 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: pnpbus.c,v 1.11 2011/07/01 16:55:42 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.10 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.11 2011/07/01 16:55:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/intr.h>
#include <machine/platform.h>
