Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:38:17 UTC 2011
Modified Files:
src/sys/arch/evbarm/adi_brh: becc_mainbus.c brh_7seg.c brh_machdep.c
com_obio.c obio.c obio_space.c
src/sys/arch/evbarm/armadillo: armadillo9_com.c armadillo9_machdep.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/evbarm/cp3100: cp3100_leds.c cp3100_pci.c
src/sys/arch/evbarm/devkit8000: if_dme_gpmc.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c
g42xxeb_machdep.c g42xxeb_var.h gb225.c gb225_pcic.c gb225_slhci.c
if_ne_obio.c obio.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/adi_brh/becc_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/adi_brh/brh_7seg.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/adi_brh/com_obio.c \
src/sys/arch/evbarm/adi_brh/obio_space.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/adi_brh/obio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/armadillo/armadillo9_com.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/cp3100/cp3100_leds.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/cp3100/cp3100_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/g42xxeb/gb225.c \
src/sys/arch/evbarm/g42xxeb/obio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/g42xxeb/gb225_slhci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/g42xxeb/if_ne_obio.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/arch/evbarm/adi_brh/becc_mainbus.c
diff -u src/sys/arch/evbarm/adi_brh/becc_mainbus.c:1.3 src/sys/arch/evbarm/adi_brh/becc_mainbus.c:1.4
--- src/sys/arch/evbarm/adi_brh/becc_mainbus.c:1.3 Sun Dec 11 12:17:06 2005
+++ src/sys/arch/evbarm/adi_brh/becc_mainbus.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: becc_mainbus.c,v 1.3 2005/12/11 12:17:06 christos Exp $ */
+/* $NetBSD: becc_mainbus.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_mainbus.c,v 1.3 2005/12/11 12:17:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_mainbus.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/adi_brh/brhreg.h>
#include <evbarm/adi_brh/brhvar.h>
Index: src/sys/arch/evbarm/adi_brh/brh_7seg.c
diff -u src/sys/arch/evbarm/adi_brh/brh_7seg.c:1.4 src/sys/arch/evbarm/adi_brh/brh_7seg.c:1.5
--- src/sys/arch/evbarm/adi_brh/brh_7seg.c:1.4 Sat Dec 24 20:06:59 2005
+++ src/sys/arch/evbarm/adi_brh/brh_7seg.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $ */
+/* $NetBSD: brh_7seg.c,v 1.5 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_7seg.c,v 1.5 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/adi_brh/brhreg.h>
#include <evbarm/adi_brh/brhvar.h>
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.37 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.38
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.37 Thu Jun 30 20:09:22 2011
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.37 2011/06/30 20:09:22 wiz Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.38 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.37 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.38 2011/07/01 20:38:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -98,7 +98,7 @@
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/adi_brh/com_obio.c
diff -u src/sys/arch/evbarm/adi_brh/com_obio.c:1.6 src/sys/arch/evbarm/adi_brh/com_obio.c:1.7
--- src/sys/arch/evbarm/adi_brh/com_obio.c:1.6 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/evbarm/adi_brh/com_obio.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.6 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: src/sys/arch/evbarm/adi_brh/obio_space.c
diff -u src/sys/arch/evbarm/adi_brh/obio_space.c:1.6 src/sys/arch/evbarm/adi_brh/obio_space.c:1.7
--- src/sys/arch/evbarm/adi_brh/obio_space.c:1.6 Sat Nov 7 07:27:42 2009
+++ src/sys/arch/evbarm/adi_brh/obio_space.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_space.c,v 1.6 2009/11/07 07:27:42 cegger Exp $ */
+/* $NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.6 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: src/sys/arch/evbarm/adi_brh/obio.c
diff -u src/sys/arch/evbarm/adi_brh/obio.c:1.10 src/sys/arch/evbarm/adi_brh/obio.c:1.11
--- src/sys/arch/evbarm/adi_brh/obio.c:1.10 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/evbarm/adi_brh/obio.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: obio.c,v 1.11 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: src/sys/arch/evbarm/armadillo/armadillo9_com.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.3 src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.4
--- src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.3 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/armadillo/armadillo9_com.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_com.c,v 1.3 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: armadillo9_com.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.3 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $");
/* Front-end of epcom */
@@ -40,7 +40,7 @@
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.20 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.21
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.20 Thu Jun 30 20:09:22 2011
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.20 2011/06/30 20:09:22 wiz Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.21 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.20 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.21 2011/07/01 20:38:16 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -141,7 +141,7 @@
#define DRAM_BLOCKS 4
#include <machine/bootconfig.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.12 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.13
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.12 Thu Jun 30 20:09:22 2011
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.12 2011/06/30 20:09:22 wiz Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.13 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.12 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.13 2011/07/01 20:38:16 dyoung Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -161,7 +161,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/armreg.h>
Index: src/sys/arch/evbarm/cp3100/cp3100_leds.c
diff -u src/sys/arch/evbarm/cp3100/cp3100_leds.c:1.1 src/sys/arch/evbarm/cp3100/cp3100_leds.c:1.2
--- src/sys/arch/evbarm/cp3100/cp3100_leds.c:1.1 Wed Nov 8 23:49:02 2006
+++ src/sys/arch/evbarm/cp3100/cp3100_leds.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cp3100_leds.c,v 1.1 2006/11/08 23:49:02 scw Exp $ */
+/* $NetBSD: cp3100_leds.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright 2006 Wasabi Systems, Inc.
@@ -36,12 +36,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cp3100_leds.c,v 1.1 2006/11/08 23:49:02 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cp3100_leds.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/cp3100/cp3100_pci.c
diff -u src/sys/arch/evbarm/cp3100/cp3100_pci.c:1.2 src/sys/arch/evbarm/cp3100/cp3100_pci.c:1.3
--- src/sys/arch/evbarm/cp3100/cp3100_pci.c:1.2 Mon Apr 4 20:37:47 2011
+++ src/sys/arch/evbarm/cp3100/cp3100_pci.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cp3100_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $ */
+/* $NetBSD: cp3100_pci.c,v 1.3 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright 2006 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cp3100_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cp3100_pci.c,v 1.3 2011/07/01 20:38:16 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c
diff -u src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c:1.1 src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c:1.2
--- src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c:1.1 Wed Sep 8 22:49:49 2010
+++ src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c Fri Jul 1 20:38:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dme_gpmc.c,v 1.1 2010/09/08 22:49:49 ahoka Exp $ */
+/* $NetBSD: if_dme_gpmc.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $ */
/*
* Copyright (c) 2010 Adam Hoka
@@ -65,7 +65,7 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/omap/omap2_gpmcvar.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.11 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.12
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.11 Sat Mar 13 11:26:42 2010
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_kmkbd.c,v 1.11 2010/03/13 11:26:42 bsh Exp $ */
+/* $NetBSD: g42xxeb_kmkbd.c,v 1.12 2011/07/01 20:38:17 dyoung Exp $ */
/*-
* Copyright (c) 2002, 2003, 2005 Genetec corp.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.11 2010/03/13 11:26:42 bsh Exp $" );
+__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.12 2011/07/01 20:38:17 dyoung Exp $" );
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <sys/callout.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.13 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.14
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.13 Sat Mar 13 11:15:52 2010
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_lcd.c,v 1.13 2010/03/13 11:15:52 bsh Exp $ */
+/* $NetBSD: g42xxeb_lcd.c,v 1.14 2011/07/01 20:38:17 dyoung Exp $ */
/*-
* Copyright (c) 2001, 2002, 2005 Genetec corp.
@@ -44,7 +44,7 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa11x0_var.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0reg.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.23 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.24
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.23 Thu Jun 30 20:09:24 2011
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.23 2011/06/30 20:09:24 wiz Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.24 2011/07/01 20:38:17 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -139,7 +139,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h:1.4 src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h:1.5
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h:1.4 Sat Mar 13 11:26:42 2010
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h Fri Jul 1 20:38:17 2011
@@ -35,7 +35,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/g42xxeb/g42xxeb_reg.h>
Index: src/sys/arch/evbarm/g42xxeb/gb225.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225.c:1.9 src/sys/arch/evbarm/g42xxeb/gb225.c:1.10
--- src/sys/arch/evbarm/g42xxeb/gb225.c:1.9 Mon Jun 7 15:17:24 2010
+++ src/sys/arch/evbarm/g42xxeb/gb225.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gb225.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
+/* $NetBSD: gb225.c,v 1.10 2011/07/01 20:38:17 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec corp. All rights reserved.
@@ -37,7 +37,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/evbarm/g42xxeb/obio.c
diff -u src/sys/arch/evbarm/g42xxeb/obio.c:1.9 src/sys/arch/evbarm/g42xxeb/obio.c:1.10
--- src/sys/arch/evbarm/g42xxeb/obio.c:1.9 Mon Jun 7 15:17:24 2010
+++ src/sys/arch/evbarm/g42xxeb/obio.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
+/* $NetBSD: obio.c,v 1.10 2011/07/01 20:38:17 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec corp. All rights reserved.
@@ -37,7 +37,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.10 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.11
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.10 Mon Jun 7 15:17:24 2010
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Fri Jul 1 20:38:17 2011
@@ -39,7 +39,7 @@
#include <sys/malloc.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pcmcia/pcmciareg.h>
Index: src/sys/arch/evbarm/g42xxeb/gb225_slhci.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_slhci.c:1.5 src/sys/arch/evbarm/g42xxeb/gb225_slhci.c:1.6
--- src/sys/arch/evbarm/g42xxeb/gb225_slhci.c:1.5 Mon Jun 7 15:17:24 2010
+++ src/sys/arch/evbarm/g42xxeb/gb225_slhci.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gb225_slhci.c,v 1.5 2010/06/07 15:17:24 bsh Exp $ */
+/* $NetBSD: gb225_slhci.c,v 1.6 2011/07/01 20:38:17 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/usb/usb.h>
Index: src/sys/arch/evbarm/g42xxeb/if_ne_obio.c
diff -u src/sys/arch/evbarm/g42xxeb/if_ne_obio.c:1.6 src/sys/arch/evbarm/g42xxeb/if_ne_obio.c:1.7
--- src/sys/arch/evbarm/g42xxeb/if_ne_obio.c:1.6 Sun Mar 16 16:08:57 2008
+++ src/sys/arch/evbarm/g42xxeb/if_ne_obio.c Fri Jul 1 20:38:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_obio.c,v 1.6 2008/03/16 16:08:57 he Exp $ */
+/* $NetBSD: if_ne_obio.c,v 1.7 2011/07/01 20:38:17 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec corp. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c,v 1.6 2008/03/16 16:08:57 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c,v 1.7 2011/07/01 20:38:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
