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

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

details:   https://anonhg.NetBSD.org/src/rev/e22079747357
branches:  trunk
changeset: 766769:e22079747357
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 18:11:24 2011 +0000

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

diffstat:

 sys/arch/i386/acpi/npx_acpi.c          |  6 +++---
 sys/arch/i386/eisa/eisa_machdep.c      |  6 +++---
 sys/arch/i386/i386/genassym.cf         |  4 ++--
 sys/arch/i386/i386/machdep.c           |  6 +++---
 sys/arch/i386/i386/rbus_machdep.c      |  6 +++---
 sys/arch/i386/include/mca_machdep.h    |  4 ++--
 sys/arch/i386/isa/ahc_isa.c            |  6 +++---
 sys/arch/i386/isa/cmos.c               |  6 +++---
 sys/arch/i386/isa/isapnp_machdep.c     |  6 +++---
 sys/arch/i386/isa/lms.c                |  6 +++---
 sys/arch/i386/isa/mms.c                |  6 +++---
 sys/arch/i386/isa/npx_isa.c            |  6 +++---
 sys/arch/i386/mca/mca_machdep.c        |  6 +++---
 sys/arch/i386/pnpbios/atppc_pnpbios.c  |  6 +++---
 sys/arch/i386/pnpbios/com_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/ess_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/fdc_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/joy_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/lm_pnpbios.c     |  6 +++---
 sys/arch/i386/pnpbios/lpt_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/npx_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/pciide_pnpbios.c |  6 +++---
 sys/arch/i386/pnpbios/sb_pnpbios.c     |  6 +++---
 sys/arch/i386/pnpbios/wss_pnpbios.c    |  6 +++---
 sys/arch/i386/pnpbios/ym_pnpbios.c     |  6 +++---
 sys/arch/i386/xbox/xbox.c              |  6 +++---
 sys/arch/i386/xbox/xboxfb.c            |  6 +++---
 sys/arch/i386/xbox/xboxlcd.c           |  6 +++---
 28 files changed, 82 insertions(+), 82 deletions(-)

diffs (truncated from 723 to 300 lines):

diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/acpi/npx_acpi.c
--- a/sys/arch/i386/acpi/npx_acpi.c     Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/acpi/npx_acpi.c     Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $ */
+/* $NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,13 +26,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.18 2009/02/21 00:30:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v 1.19 2011/07/01 18:14:15 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpufunc.h>
 #include <machine/intr.h>
 #include <machine/specialreg.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/eisa/eisa_machdep.c
--- a/sys/arch/i386/eisa/eisa_machdep.c Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/eisa/eisa_machdep.c Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $ */
+/*     $NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.34 2009/11/17 23:51:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.35 2011/07/01 18:14:15 dyoung Exp $");
 
 #include "ioapic.h"
 
@@ -76,7 +76,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bus_private.h>
 
 #include <dev/isa/isareg.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.89 2011/06/12 03:35:41 rmind Exp $
+#      $NetBSD: genassym.cf,v 1.90 2011/07/01 18:14:15 dyoung Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@
 include <machine/tlog.h>
 
 
-include <x86/bus.h>
+include <sys/bus.h>
 
 define PAGE_SIZE               PAGE_SIZE
 
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/i386/machdep.c      Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $      */
+/*     $NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.705 2011/06/30 23:28:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.706 2011/07/01 18:14:15 dyoung Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -212,7 +212,7 @@
 #include "cardbus.h"
 #if NCARDBUS > 0
 /* For rbus_min_start hint. */
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/cardbus/rbus.h>
 #include <machine/rbus_machdep.h>
 #endif
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/i386/rbus_machdep.c
--- a/sys/arch/i386/i386/rbus_machdep.c Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/i386/rbus_machdep.c Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.25 2010/03/01 01:15:24 jym Exp $    */
+/*     $NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $ */
 
 /*
  * Copyright (c) 1999
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.25 2010/03/01 01:15:24 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.26 2011/07/01 18:14:15 dyoung Exp $");
 
 #include "opt_pcibios.h"
 #include "opt_pcifixup.h"
@@ -39,7 +39,7 @@
 
 #include <sys/sysctl.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/cardbus/rbus.h>
 
 #include <sys/device.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/include/mca_machdep.h
--- a/sys/arch/i386/include/mca_machdep.h       Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/include/mca_machdep.h       Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mca_machdep.h,v 1.14 2011/04/03 22:29:26 dyoung Exp $  */
+/*     $NetBSD: mca_machdep.h,v 1.15 2011/07/01 18:15:11 dyoung Exp $  */
 
 /*
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 #define _I386_MCA_MACHDEP_H_
 
 #include <sys/device.h>        /* for device_t */
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * i386-specific definitions for MCA autoconfiguration.
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/ahc_isa.c
--- a/sys/arch/i386/isa/ahc_isa.c       Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/ahc_isa.c       Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $ */
+/*     $NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $      */
 
 /*
  * Product specific probe and attach routines for:
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.38 2010/02/28 15:52:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.39 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,7 +120,7 @@
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/scsipi/scsi_all.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/cmos.c
--- a/sys/arch/i386/isa/cmos.c  Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/cmos.c  Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $   */
+/*     $NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $  */
 
 /*
  * Copyright (C) 2003 JONE System Co., Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.8 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.9 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,7 @@
 #include <sys/conf.h>
 #include <sys/kauth.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/isa/isareg.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/isapnp_machdep.c
--- a/sys/arch/i386/isa/isapnp_machdep.c        Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/isapnp_machdep.c        Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $       */
+/*     $NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -45,14 +45,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.16 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.17 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isavar.h>
 
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/lms.c
--- a/sys/arch/i386/isa/lms.c   Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/lms.c   Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $  */
+/*     $NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $  */
 
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,14 +24,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.55 2009/05/04 12:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.56 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/isa/isavar.h>
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/mms.c
--- a/sys/arch/i386/isa/mms.c   Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/mms.c   Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $  */
+/*     $NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $  */
 
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.52 2009/05/04 12:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.53 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -32,7 +32,7 @@
 #include <sys/device.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isavar.h>
 
diff -r 93569dea0ad0 -r e22079747357 sys/arch/i386/isa/npx_isa.c
--- a/sys/arch/i386/isa/npx_isa.c       Fri Jul 01 17:37:26 2011 +0000
+++ b/sys/arch/i386/isa/npx_isa.c       Fri Jul 01 18:11:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $      */
+/*     $NetBSD: npx_isa.c,v 1.22 2011/07/01 18:11:24 dyoung Exp $      */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -67,13 +67,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_isa.c,v 1.21 2009/05/04 12:38:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_isa.c,v 1.22 2011/07/01 18:11:24 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpufunc.h>
 #include <machine/intr.h>
 #include <machine/specialreg.h>