Module Name: src
Committed By: dyoung
Date: Wed May 18 01:02:44 UTC 2011
Modified Files:
src/sys/dev/pci: if_bgevar.h if_bwi_pci.c if_et.c if_iwn.c
src/sys/dev/pci/n8: helper.h
Log Message:
#include <sys/bus.h>, not <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_bgevar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_bwi_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_et.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/helper.h
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/if_bgevar.h
diff -u src/sys/dev/pci/if_bgevar.h:1.6 src/sys/dev/pci/if_bgevar.h:1.7
--- src/sys/dev/pci/if_bgevar.h:1.6 Sun Jan 9 13:01:03 2011
+++ src/sys/dev/pci/if_bgevar.h Wed May 18 01:02:43 2011
@@ -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>
Index: src/sys/dev/pci/if_bwi_pci.c
diff -u src/sys/dev/pci/if_bwi_pci.c:1.10 src/sys/dev/pci/if_bwi_pci.c:1.11
--- src/sys/dev/pci/if_bwi_pci.c:1.10 Sat Oct 9 19:46:15 2010
+++ src/sys/dev/pci/if_bwi_pci.c Wed May 18 01:02:43 2011
@@ -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>
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.1 src/sys/dev/pci/if_et.c:1.2
--- src/sys/dev/pci/if_et.c:1.1 Sat Nov 13 00:47:25 2010
+++ src/sys/dev/pci/if_et.c Wed May 18 01:02:43 2011
@@ -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>
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.53 src/sys/dev/pci/if_iwn.c:1.54
--- src/sys/dev/pci/if_iwn.c:1.53 Sun May 15 13:56:20 2011
+++ src/sys/dev/pci/if_iwn.c Wed May 18 01:02:43 2011
@@ -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>
Index: src/sys/dev/pci/n8/helper.h
diff -u src/sys/dev/pci/n8/helper.h:1.1 src/sys/dev/pci/n8/helper.h:1.2
--- src/sys/dev/pci/n8/helper.h:1.1 Thu Oct 30 12:02:14 2008
+++ src/sys/dev/pci/n8/helper.h Wed May 18 01:02:44 2011
@@ -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>
