Module Name: src
Committed By: dyoung
Date: Wed May 18 01:02:00 UTC 2011
Modified Files:
src/sys/dev/pci/cxgb: cxgb_adapter.h cxgb_lro.c cxgb_main.c
cxgb_offload.c cxgb_osdep.c cxgb_osdep.h cxgb_sge.c
Log Message:
MI code must #include <sys/bus.h>, not <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxgb/cxgb_adapter.h \
src/sys/dev/pci/cxgb/cxgb_lro.c src/sys/dev/pci/cxgb/cxgb_main.c \
src/sys/dev/pci/cxgb/cxgb_offload.c src/sys/dev/pci/cxgb/cxgb_osdep.c \
src/sys/dev/pci/cxgb/cxgb_osdep.h src/sys/dev/pci/cxgb/cxgb_sge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_adapter.h
diff -u src/sys/dev/pci/cxgb/cxgb_adapter.h:1.1 src/sys/dev/pci/cxgb/cxgb_adapter.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_adapter.h:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_adapter.h Wed May 18 01:01:59 2011
@@ -43,7 +43,7 @@
#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>
Index: src/sys/dev/pci/cxgb/cxgb_lro.c
diff -u src/sys/dev/pci/cxgb/cxgb_lro.c:1.1 src/sys/dev/pci/cxgb/cxgb_lro.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_lro.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_lro.c Wed May 18 01:01:59 2011
@@ -28,14 +28,14 @@
***************************************************************************/
#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>
Index: src/sys/dev/pci/cxgb/cxgb_main.c
diff -u src/sys/dev/pci/cxgb/cxgb_main.c:1.1 src/sys/dev/pci/cxgb/cxgb_main.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_main.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_main.c Wed May 18 01:01:59 2011
@@ -28,13 +28,13 @@
***************************************************************************/
#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>
Index: src/sys/dev/pci/cxgb/cxgb_offload.c
diff -u src/sys/dev/pci/cxgb/cxgb_offload.c:1.1 src/sys/dev/pci/cxgb/cxgb_offload.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_offload.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_offload.c Wed May 18 01:01:59 2011
@@ -31,13 +31,13 @@
#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>
Index: src/sys/dev/pci/cxgb/cxgb_osdep.c
diff -u src/sys/dev/pci/cxgb/cxgb_osdep.c:1.1 src/sys/dev/pci/cxgb/cxgb_osdep.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_osdep.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_osdep.c Wed May 18 01:01:59 2011
@@ -33,7 +33,7 @@
#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>
Index: src/sys/dev/pci/cxgb/cxgb_osdep.h
diff -u src/sys/dev/pci/cxgb/cxgb_osdep.h:1.1 src/sys/dev/pci/cxgb/cxgb_osdep.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_osdep.h:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_osdep.h Wed May 18 01:01:59 2011
@@ -41,7 +41,7 @@
#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>
Index: src/sys/dev/pci/cxgb/cxgb_sge.c
diff -u src/sys/dev/pci/cxgb/cxgb_sge.c:1.1 src/sys/dev/pci/cxgb/cxgb_sge.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_sge.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_sge.c Wed May 18 01:01:59 2011
@@ -28,13 +28,13 @@
***************************************************************************/
#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>
