[src/trunk]: src/sys/dev #include <sys/bus.h>, not <machine/bus.h>.

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

details:   https://anonhg.NetBSD.org/src/rev/4062c16a6cf2
branches:  trunk
changeset: 765060:4062c16a6cf2
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed May 18 01:02:43 2011 +0000

description:
#include <sys/bus.h>, not <machine/bus.h>.

diffstat:

 sys/dev/isa/wbsio.c       |  4 ++--
 sys/dev/pci/if_bgevar.h   |  4 ++--
 sys/dev/pci/if_bwi_pci.c  |  6 +++---
 sys/dev/pci/if_et.c       |  6 +++---
 sys/dev/pci/if_iwn.c      |  6 +++---
 sys/dev/pci/n8/helper.h   |  2 +-
 sys/dev/sdmmc/sdmmcchip.h |  4 ++--
 sys/dev/sdmmc/sdmmcvar.h  |  4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diffs (165 lines):

diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/isa/wbsio.c
--- a/sys/dev/isa/wbsio.c       Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/isa/wbsio.c       Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wbsio.c,v 1.2 2010/03/19 02:17:41 cnst Exp $   */
+/*     $NetBSD: wbsio.c,v 1.3 2011/05/18 01:03:15 dyoung Exp $ */
 /*     $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis%openbsd.org@localhost>
@@ -25,7 +25,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/pci/if_bgevar.h
--- a/sys/dev/pci/if_bgevar.h   Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/pci/if_bgevar.h   Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bgevar.h,v 1.6 2011/01/09 13:01:03 jruoho Exp $     */
+/*     $NetBSD: if_bgevar.h,v 1.7 2011/05/18 01:02:43 dyoung Exp $     */
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -66,7 +66,7 @@
 #ifndef _DEV_PCI_IF_BGEVAR_H_
 #define _DEV_PCI_IF_BGEVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <net/if_ether.h>
 #include <dev/pci/pcivar.h>
 
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/pci/if_bwi_pci.c
--- a/sys/dev/pci/if_bwi_pci.c  Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/pci/if_bwi_pci.c  Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bwi_pci.c,v 1.10 2010/10/09 19:46:15 phx Exp $      */
+/*     $NetBSD: if_bwi_pci.c,v 1.11 2011/05/18 01:02:43 dyoung Exp $   */
 /*     $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */
 
 /*
@@ -24,7 +24,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.10 2010/10/09 19:46:15 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.11 2011/05/18 01:02:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -36,7 +36,7 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/pci/if_et.c
--- a/sys/dev/pci/if_et.c       Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/pci/if_et.c       Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_et.c,v 1.1 2010/11/13 00:47:25 jnemeth Exp $        */
+/*     $NetBSD: if_et.c,v 1.2 2011/05/18 01:02:43 dyoung Exp $ */
 /*     $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $  */
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.1 2010/11/13 00:47:25 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.2 2011/05/18 01:02:43 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "vlan.h"
@@ -54,7 +54,7 @@
 #include <sys/callout.h>
 #include <sys/socket.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/pci/if_iwn.c      Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwn.c,v 1.53 2011/05/15 13:56:20 christos Exp $     */
+/*     $NetBSD: if_iwn.c,v 1.54 2011/05/18 01:02:43 dyoung Exp $       */
 /*     $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $      */
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.53 2011/05/15 13:56:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.54 2011/05/18 01:02:43 dyoung Exp $");
 
 #define IWN_USE_RBUF   /* Use local storage for RX */
 #undef IWN_HWCRYPTO    /* XXX does not even compile yet */
@@ -42,7 +42,7 @@
 
 #include <dev/sysmon/sysmonvar.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/endian.h>
 #include <machine/intr.h>
 
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/pci/n8/helper.h
--- a/sys/dev/pci/n8/helper.h   Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/pci/n8/helper.h   Wed May 18 01:02:43 2011 +0000
@@ -70,7 +70,7 @@
 #include <sys/bus.h>
 #include <sys/uio.h>
 #include <sys/poll.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 #include <sys/proc.h>
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/sdmmc/sdmmcchip.h
--- a/sys/dev/sdmmc/sdmmcchip.h Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/sdmmc/sdmmcchip.h Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdmmcchip.h,v 1.3 2010/10/07 12:00:21 kiyohara Exp $   */
+/*     $NetBSD: sdmmcchip.h,v 1.4 2011/05/18 01:07:17 dyoung Exp $     */
 /*     $OpenBSD: sdmmcchip.h,v 1.3 2007/05/31 10:09:01 uwe Exp $       */
 
 /*
@@ -22,7 +22,7 @@
 
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct sdmmc_command;
 
diff -r ac043798e60e -r 4062c16a6cf2 sys/dev/sdmmc/sdmmcvar.h
--- a/sys/dev/sdmmc/sdmmcvar.h  Wed May 18 01:01:59 2011 +0000
+++ b/sys/dev/sdmmc/sdmmcvar.h  Wed May 18 01:02:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdmmcvar.h,v 1.10 2011/02/13 06:43:52 nonaka Exp $     */
+/*     $NetBSD: sdmmcvar.h,v 1.11 2011/05/18 01:07:17 dyoung Exp $     */
 /*     $OpenBSD: sdmmcvar.h,v 1.13 2009/01/09 10:55:22 jsg Exp $       */
 
 /*
@@ -24,7 +24,7 @@
 #include <sys/mutex.h>
 #include <sys/callout.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/sdmmc/sdmmcchip.h>
 #include <dev/sdmmc/sdmmcreg.h>