From 399cdcdfe9f5e1857247eb7da4be5fbb18ecfaaa Mon Sep 17 00:00:00 2001
From: dyoung <dyoung@NetBSD.org>
Date: Wed, 18 May 2011 01:01:59 +0000
Subject: [PATCH] MI code must #include <sys/bus.h>, not <machine/bus.h>.

---
 sys/dev/pci/cxgb/cxgb_adapter.h | 2 +-
 sys/dev/pci/cxgb/cxgb_lro.c     | 4 ++--
 sys/dev/pci/cxgb/cxgb_main.c    | 4 ++--
 sys/dev/pci/cxgb/cxgb_offload.c | 4 ++--
 sys/dev/pci/cxgb/cxgb_osdep.c   | 2 +-
 sys/dev/pci/cxgb/cxgb_osdep.h   | 2 +-
 sys/dev/pci/cxgb/cxgb_sge.c     | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys/dev/pci/cxgb/cxgb_adapter.h b/sys/dev/pci/cxgb/cxgb_adapter.h
index c36f296b21ed..f0d0cb44ee87 100644
--- a/sys/dev/pci/cxgb/cxgb_adapter.h
+++ b/sys/dev/pci/cxgb/cxgb_adapter.h
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/pci/cxgb/cxgb_lro.c b/sys/dev/pci/cxgb/cxgb_lro.c
index 8a844d5cc591..e5fa51af3c5e 100644
--- a/sys/dev/pci/cxgb/cxgb_lro.c
+++ b/sys/dev/pci/cxgb/cxgb_lro.c
@@ -28,14 +28,14 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_lro.c,v 1.1 2010/03/21 21:11:13 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_lro.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $");
 
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/queue.h>
 
 #include <netinet/in_systm.h>
diff --git a/sys/dev/pci/cxgb/cxgb_main.c b/sys/dev/pci/cxgb/cxgb_main.c
index d666601a93e9..7116b0e48c04 100644
--- a/sys/dev/pci/cxgb/cxgb_main.c
+++ b/sys/dev/pci/cxgb/cxgb_main.c
@@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.1 2010/03/21 21:11:13 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/ioccom.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/pci/cxgb/cxgb_offload.c b/sys/dev/pci/cxgb/cxgb_offload.c
index 051b7255f487..c5cf9c2673dc 100644
--- a/sys/dev/pci/cxgb/cxgb_offload.c
+++ b/sys/dev/pci/cxgb/cxgb_offload.c
@@ -31,13 +31,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.1 2010/03/21 21:11:13 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/ioccom.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/pci/cxgb/cxgb_osdep.c b/sys/dev/pci/cxgb/cxgb_osdep.c
index d7aa34e6d6ff..ccba3f24c96d 100644
--- a/sys/dev/pci/cxgb/cxgb_osdep.c
+++ b/sys/dev/pci/cxgb/cxgb_osdep.c
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/ioccom.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/pci/cxgb/cxgb_osdep.h b/sys/dev/pci/cxgb/cxgb_osdep.h
index 9d477eef7848..a88b77f0cab2 100644
--- a/sys/dev/pci/cxgb/cxgb_osdep.h
+++ b/sys/dev/pci/cxgb/cxgb_osdep.h
@@ -41,7 +41,7 @@ typedef char *caddr_t;
 #include <dev/pci/cxgb/cxgb_version.h>
 #include <dev/pci/cxgb/cxgb_config.h>
 #include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
diff --git a/sys/dev/pci/cxgb/cxgb_sge.c b/sys/dev/pci/cxgb/cxgb_sge.c
index 51d7975087df..53ad9b7102d0 100644
--- a/sys/dev/pci/cxgb/cxgb_sge.c
+++ b/sys/dev/pci/cxgb/cxgb_sge.c
@@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.1 2010/03/21 21:11:13 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>