[src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/54134dd7d0b0
branches:  trunk
changeset: 766776:54134dd7d0b0
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 20:47:43 2011 +0000

description:
#include <sys/bus.h> instead of <machine/bus.h>.

diffstat:

 sys/arch/ibmnws/ibmnws/consinit.c                |  4 ++--
 sys/arch/ibmnws/ibmnws/cpu.c                     |  4 ++--
 sys/arch/ibmnws/ibmnws/mainbus.c                 |  4 ++--
 sys/arch/ibmnws/pci/pci_machdep.c                |  4 ++--
 sys/arch/iyonix/iyonix/com_obio.c                |  6 +++---
 sys/arch/iyonix/iyonix/i80321_mainbus.c          |  6 +++---
 sys/arch/iyonix/iyonix/iyonix_machdep.c          |  6 +++---
 sys/arch/iyonix/iyonix/iyonix_pci.c              |  6 +++---
 sys/arch/iyonix/iyonix/obio.c                    |  6 +++---
 sys/arch/iyonix/iyonix/obio_space.c              |  6 +++---
 sys/arch/mips/bonito/bonito_pci.c                |  6 +++---
 sys/arch/mvmeppc/isa/mkclock_isa.c               |  6 +++---
 sys/arch/mvmeppc/mvmeppc/cpu.c                   |  6 +++---
 sys/arch/mvmeppc/mvmeppc/mainbus.c               |  6 +++---
 sys/arch/mvmeppc/pci/pci_machdep.c               |  6 +++---
 sys/arch/netwinder/netwinder/netwinder_machdep.c |  6 +++---
 sys/arch/netwinder/pci/pcib.c                    |  6 +++---
 sys/arch/ofppc/isa/isa_machdep.c                 |  6 +++---
 sys/arch/ofppc/ofppc/machdep.c                   |  6 +++---
 sys/arch/ofppc/pci/gt_mainbus.c                  |  6 +++---
 sys/arch/prep/eisa/eisa_machdep.c                |  6 +++---
 sys/arch/prep/prep/consinit.c                    |  6 +++---
 sys/arch/prep/prep/cpu.c                         |  6 +++---
 sys/arch/prep/prep/mainbus.c                     |  6 +++---
 24 files changed, 68 insertions(+), 68 deletions(-)

diffs (truncated from 594 to 300 lines):

diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/ibmnws/ibmnws/consinit.c
--- a/sys/arch/ibmnws/ibmnws/consinit.c Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/ibmnws/ibmnws/consinit.c Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.4 2008/05/15 23:38:49 rjs Exp $ */
+/*     $NetBSD: consinit.c,v 1.5 2011/07/01 20:47:43 dyoung Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/cons.h>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/ibmnws/ibmnws/cpu.c
--- a/sys/arch/ibmnws/ibmnws/cpu.c      Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/ibmnws/ibmnws/cpu.c      Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.6 2008/11/03 15:13:16 rjs Exp $      */
+/*     $NetBSD: cpu.c,v 1.7 2011/07/01 20:47:43 dyoung Exp $   */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 int cpumatch(device_t, cfdata_t, void *);
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/ibmnws/ibmnws/mainbus.c
--- a/sys/arch/ibmnws/ibmnws/mainbus.c  Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/ibmnws/ibmnws/mainbus.c  Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.9 2011/05/17 17:34:50 dyoung Exp $       */
+/*     $NetBSD: mainbus.c,v 1.10 2011/07/01 20:47:43 dyoung Exp $      */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
 #include <sys/malloc.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/isa_machdep.h>
 
 #include <dev/pci/pcivar.h>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/ibmnws/pci/pci_machdep.c
--- a/sys/arch/ibmnws/pci/pci_machdep.c Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/ibmnws/pci/pci_machdep.c Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.8 2011/06/30 00:52:57 matt Exp $     */
+/*     $NetBSD: pci_machdep.c,v 1.9 2011/07/01 20:47:43 dyoung Exp $   */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -49,7 +49,7 @@
 #include <uvm/uvm_extern.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/isa/isavar.h>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/com_obio.c
--- a/sys/arch/iyonix/iyonix/com_obio.c Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/com_obio.c Fri Jul 01 20:47:43 2011 +0000
@@ -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>
 
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/i80321_mainbus.c
--- a/sys/arch/iyonix/iyonix/i80321_mainbus.c   Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/i80321_mainbus.c   Fri Jul 01 20:47:43 2011 +0000
@@ -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>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/iyonix_machdep.c
--- a/sys/arch/iyonix/iyonix/iyonix_machdep.c   Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/iyonix_machdep.c   Fri Jul 01 20:47:43 2011 +0000
@@ -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>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/iyonix_pci.c
--- a/sys/arch/iyonix/iyonix/iyonix_pci.c       Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/iyonix_pci.c       Fri Jul 01 20:47:43 2011 +0000
@@ -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>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/obio.c
--- a/sys/arch/iyonix/iyonix/obio.c     Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/obio.c     Fri Jul 01 20:47:43 2011 +0000
@@ -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>
 
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/iyonix/iyonix/obio_space.c
--- a/sys/arch/iyonix/iyonix/obio_space.c       Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/iyonix/iyonix/obio_space.c       Fri Jul 01 20:47:43 2011 +0000
@@ -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);
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/mips/bonito/bonito_pci.c
--- a/sys/arch/mips/bonito/bonito_pci.c Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/mips/bonito/bonito_pci.c Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bonito_pci.c,v 1.7 2009/08/09 04:09:55 matt Exp $      */
+/*     $NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,13 +35,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.7 2009/08/09 04:09:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_pci.c,v 1.8 2011/07/01 20:48:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/locore.h>
 
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/mvmeppc/isa/mkclock_isa.c
--- a/sys/arch/mvmeppc/isa/mkclock_isa.c        Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/mvmeppc/isa/mkclock_isa.c        Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkclock_isa.c,v 1.13 2008/04/28 20:23:29 martin Exp $  */
+/*     $NetBSD: mkclock_isa.c,v 1.14 2011/07/01 20:50:00 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,14 +35,14 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.13 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.14 2011/07/01 20:50:00 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 <dev/clock_subr.h>
 #include <dev/ic/mk48txxreg.h>
diff -r a2fe4d3350e1 -r 54134dd7d0b0 sys/arch/mvmeppc/mvmeppc/cpu.c
--- a/sys/arch/mvmeppc/mvmeppc/cpu.c    Fri Jul 01 20:36:42 2011 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/cpu.c    Fri Jul 01 20:47:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $     */
+/*     $NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10 2011/07/01 20:49:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>