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

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

details:   https://anonhg.NetBSD.org/src/rev/93569dea0ad0
branches:  trunk
changeset: 766768:93569dea0ad0
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 17:37:26 2011 +0000

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

diffstat:

 sys/arch/i386/pci/ali1543.c        |  6 +++---
 sys/arch/i386/pci/amd756.c         |  6 +++---
 sys/arch/i386/pci/elan520.c        |  6 +++---
 sys/arch/i386/pci/gcscehci.c       |  6 +++---
 sys/arch/i386/pci/geode.c          |  6 +++---
 sys/arch/i386/pci/geodecntr.c      |  6 +++---
 sys/arch/i386/pci/geodewdg.c       |  6 +++---
 sys/arch/i386/pci/gscpcib.c        |  6 +++---
 sys/arch/i386/pci/opti82c558.c     |  6 +++---
 sys/arch/i386/pci/opti82c700.c     |  6 +++---
 sys/arch/i386/pci/pceb.c           |  6 +++---
 sys/arch/i386/pci/pci_intr_fixup.c |  6 +++---
 sys/arch/i386/pci/pcmb.c           |  7 +++----
 sys/arch/i386/pci/piix.c           |  6 +++---
 sys/arch/i386/pci/piixpcib.c       |  6 +++---
 sys/arch/i386/pci/sis85c503.c      |  6 +++---
 sys/arch/i386/pci/via8231.c        |  6 +++---
 sys/arch/i386/pci/via82c586.c      |  6 +++---
 18 files changed, 54 insertions(+), 55 deletions(-)

diffs (truncated from 479 to 300 lines):

diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/ali1543.c
--- a/sys/arch/i386/pci/ali1543.c       Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/ali1543.c       Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $ */
+/*     $NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $      */
 
 /*
  * Copyright (c) 2001
@@ -84,7 +84,7 @@
 /* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.12 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@
 #include <sys/proc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/amd756.c
--- a/sys/arch/i386/pci/amd756.c        Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/amd756.c        Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $        */
+/*     $NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $        */
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.8 2008/04/28 20:23:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/elan520.c
--- a/sys/arch/i386/pci/elan520.c       Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/elan520.c       Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elan520.c,v 1.48 2010/02/26 19:25:07 jym Exp $ */
+/*     $NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.48 2010/02/26 19:25:07 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,7 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <x86/nmi.h>
 
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/gcscehci.c
--- a/sys/arch/i386/pci/gcscehci.c      Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/gcscehci.c      Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@
 #include <sys/proc.h>
 #include <sys/queue.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpufunc.h>
 
 #include <dev/pci/pcidevs.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/geode.c
--- a/sys/arch/i386/pci/geode.c Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/geode.c Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $ */
+/*     $NetBSD: geode.c,v 1.15 2011/07/01 17:37:26 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -64,14 +64,14 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.14 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.15 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/wdog.h>
 #include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <arch/i386/pci/geodevar.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/geodecntr.c
--- a/sys/arch/i386/pci/geodecntr.c     Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/geodecntr.c     Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: geodecntr.c,v 1.8 2008/05/10 13:35:56 jmcneill Exp $   */
+/*     $NetBSD: geodecntr.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodecntr.c,v 1.8 2008/05/10 13:35:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodecntr.c,v 1.9 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arch/i386/pci/geodevar.h>
 #include <arch/i386/pci/geodereg.h>
 
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/geodewdg.c
--- a/sys/arch/i386/pci/geodewdg.c      Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/geodewdg.c      Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $      */
+/*     $NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -63,14 +63,14 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.10 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/wdog.h>
 #include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <arch/i386/pci/geodevar.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/gscpcib.c
--- a/sys/arch/i386/pci/gscpcib.c       Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/gscpcib.c       Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gscpcib.c,v 1.15 2010/01/08 00:09:44 dyoung Exp $      */
+/*     $NetBSD: gscpcib.c,v 1.16 2011/07/01 17:37:26 dyoung Exp $      */
 /*     $OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $      */
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange%openbsd.org@localhost>
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.15 2010/01/08 00:09:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.16 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -31,7 +31,7 @@
 #include <sys/gpio.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/opti82c558.c
--- a/sys/arch/i386/pci/opti82c558.c    Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/opti82c558.c    Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opti82c558.c,v 1.9 2008/04/28 20:23:25 martin Exp $    */
+/*     $NetBSD: opti82c558.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.9 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opti82c558.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/opti82c700.c
--- a/sys/arch/i386/pci/opti82c700.c    Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/opti82c700.c    Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opti82c700.c,v 1.9 2008/04/28 20:23:25 martin Exp $    */
+/*     $NetBSD: opti82c700.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.9 2008/04/28 20:23:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opti82c700.c,v 1.10 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/pceb.c
--- a/sys/arch/i386/pci/pceb.c  Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/pceb.c  Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pceb.c,v 1.23 2010/04/28 19:17:03 dyoung Exp $ */
+/*     $NetBSD: pceb.c,v 1.24 2011/07/01 17:37:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.23 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.24 2011/07/01 17:37:26 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/eisa/eisavar.h>
diff -r 7cd268052355 -r 93569dea0ad0 sys/arch/i386/pci/pci_intr_fixup.c
--- a/sys/arch/i386/pci/pci_intr_fixup.c        Fri Jul 01 17:34:44 2011 +0000
+++ b/sys/arch/i386/pci/pci_intr_fixup.c        Fri Jul 01 17:37:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_intr_fixup.c,v 1.48 2011/06/06 14:33:31 msaitoh Exp $      */
+/*     $NetBSD: pci_intr_fixup.c,v 1.49 2011/07/01 17:37:26 dyoung Exp $       */