Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:42:38 UTC 2011
Modified Files:
src/sys/arch/evbarm/ixdp425: ixdp425_led.c ixdp425_machdep.c
ixdp425_mainbus.c ixdp425_pci.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c ixm1200_pci.c
ixp12x0_mainbus.c ixpcom_ixm.c nappi_nppb.c nappi_nr.c
src/sys/arch/evbarm/lubbock: if_sm_obio.c lubbock_lcd.c
lubbock_machdep.c lubbock_pcic.c lubbock_var.h obio.c sacc_obio.c
sm_obio_space.c
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/ixdp425/ixdp425_led.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c \
src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c \
src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c \
src/sys/arch/evbarm/ixm1200/nappi_nppb.c \
src/sys/arch/evbarm/ixm1200/nappi_nr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/lubbock/if_sm_obio.c \
src/sys/arch/evbarm/lubbock/sm_obio_space.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/lubbock/lubbock_lcd.c \
src/sys/arch/evbarm/lubbock/sacc_obio.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/lubbock/lubbock_pcic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/lubbock/lubbock_var.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/lubbock/obio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/netwalker/netwalker_machdep.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/ixdp425/ixdp425_led.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.4 src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.5
--- src/sys/arch/evbarm/ixdp425/ixdp425_led.c:1.4 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/ixdp425/ixdp425_led.c Fri Jul 1 20:42:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $");
/*
* LED support for IXDP425
@@ -39,7 +39,7 @@
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425_sipvar.h>
#include <arm/xscale/ixp425var.h>
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.28 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.29
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.28 Thu Jun 30 20:09:25 2011
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Fri Jul 1 20:42:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -90,7 +90,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/ixdp425/ixdp425_mainbus.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.6 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.7
--- src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.6 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c Fri Jul 1 20:42:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $ */
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $");
/*
* front-end for the ixp425 NetworkProcessor.
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.7 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.8
--- src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.7 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/ixdp425/ixdp425_pci.c Fri Jul 1 20:42:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_pci.c,v 1.7 2011/04/04 20:37:48 dyoung Exp $ */
+/* $NetBSD: ixdp425_pci.c,v 1.8 2011/07/01 20:42:36 dyoung Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.7 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.8 2011/07/01 20:42:36 dyoung Exp $");
/*
* IXDP425 PCI interrupt support.
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixdp425/ixdp425reg.h>
#include <evbarm/ixdp425/ixdp425var.h>
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.48 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.49
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.48 Thu Jun 30 20:09:25 2011
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.48 2011/06/30 20:09:25 wiz Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.49 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.48 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.49 2011/07/01 20:42:37 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -96,7 +96,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/ixm1200/ixm1200_pci.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.8 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.9
--- src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.8 Mon Apr 4 20:37:48 2011
+++ src/sys/arch/evbarm/ixm1200/ixm1200_pci.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_pci.c,v 1.8 2011/04/04 20:37:48 dyoung Exp $ */
+/* $NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.8 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
/*
* IXM1200 PCI interrupt support.
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixm1200/ixm1200reg.h>
#include <evbarm/ixm1200/ixm1200var.h>
Index: src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c
diff -u src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c:1.8 src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c:1.9
--- src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c:1.8 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_mainbus.c,v 1.8 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: ixp12x0_mainbus.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_mainbus.c,v 1.8 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_mainbus.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
/*
* front-end for the ixp12x0 I/O Processor.
@@ -38,7 +38,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixm1200/ixm1200reg.h>
#include <evbarm/ixm1200/ixm1200var.h>
Index: src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c
diff -u src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.8 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.9
--- src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.8 Wed Oct 21 14:15:51 2009
+++ src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpcom_ixm.c,v 1.8 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: ixpcom_ixm.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.8 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
/* Front-end of ixpcom */
@@ -40,7 +40,7 @@
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0_comreg.h>
#include <arm/ixp12x0/ixp12x0_comvar.h>
Index: src/sys/arch/evbarm/ixm1200/nappi_nppb.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.8 src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.9
--- src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.8 Mon Jun 6 16:29:15 2011
+++ src/sys/arch/evbarm/ixm1200/nappi_nppb.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $ */
+/* $NetBSD: nappi_nppb.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -39,7 +39,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/evbarm/ixm1200/nappi_nr.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.8 src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.9
--- src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.8 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbarm/ixm1200/nappi_nr.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nr.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.8 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
/*
* LED support for NAPPI.
@@ -43,7 +43,7 @@
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixpsipvar.h>
Index: src/sys/arch/evbarm/lubbock/if_sm_obio.c
diff -u src/sys/arch/evbarm/lubbock/if_sm_obio.c:1.3 src/sys/arch/evbarm/lubbock/if_sm_obio.c:1.4
--- src/sys/arch/evbarm/lubbock/if_sm_obio.c:1.3 Fri May 29 14:15:44 2009
+++ src/sys/arch/evbarm/lubbock/if_sm_obio.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_obio.c,v 1.3 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: if_sm_obio.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c,v 1.3 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,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>
Index: src/sys/arch/evbarm/lubbock/sm_obio_space.c
diff -u src/sys/arch/evbarm/lubbock/sm_obio_space.c:1.3 src/sys/arch/evbarm/lubbock/sm_obio_space.c:1.4
--- src/sys/arch/evbarm/lubbock/sm_obio_space.c:1.3 Sun Dec 11 12:17:09 2005
+++ src/sys/arch/evbarm/lubbock/sm_obio_space.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sm_obio_space.c,v 1.3 2005/12/11 12:17:09 christos Exp $ */
+/* $NetBSD: sm_obio_space.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sm_obio_space.c,v 1.3 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sm_obio_space.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/evbarm/lubbock/lubbock_lcd.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.11 src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.12
--- src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.11 Sat Mar 13 11:15:52 2010
+++ src/sys/arch/evbarm/lubbock/lubbock_lcd.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_lcd.c,v 1.11 2010/03/13 11:15:52 bsh Exp $ */
+/* $NetBSD: lubbock_lcd.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
* LCD panel geometry
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.11 2010/03/13 11:15:52 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0reg.h>
#include <arm/xscale/pxa2x0_lcd.h>
Index: src/sys/arch/evbarm/lubbock/sacc_obio.c
diff -u src/sys/arch/evbarm/lubbock/sacc_obio.c:1.11 src/sys/arch/evbarm/lubbock/sacc_obio.c:1.12
--- src/sys/arch/evbarm/lubbock/sacc_obio.c:1.11 Sat Mar 13 10:55:09 2010
+++ src/sys/arch/evbarm/lubbock/sacc_obio.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sacc_obio.c,v 1.11 2010/03/13 10:55:09 bsh Exp $ */
+/* $NetBSD: sacc_obio.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.11 2010/03/13 10:55:09 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa1111_reg.h>
#include <arm/sa11x0/sa1111_var.h>
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.27 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.28
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.27 Thu Jun 30 20:09:25 2011
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.27 2011/06/30 20:09:25 wiz Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.28 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.27 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.28 2011/07/01 20:42:37 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -147,7 +147,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/lubbock/lubbock_pcic.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.6 src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.7
--- src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.6 Sat Mar 13 11:13:31 2010
+++ src/sys/arch/evbarm/lubbock/lubbock_pcic.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $ */
+/* $NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
Index: src/sys/arch/evbarm/lubbock/lubbock_var.h
diff -u src/sys/arch/evbarm/lubbock/lubbock_var.h:1.2 src/sys/arch/evbarm/lubbock/lubbock_var.h:1.3
--- src/sys/arch/evbarm/lubbock/lubbock_var.h:1.2 Fri May 29 14:15:44 2009
+++ src/sys/arch/evbarm/lubbock/lubbock_var.h Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_var.h,v 1.2 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: lubbock_var.h,v 1.3 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -35,7 +35,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/lubbock/lubbock_reg.h>
Index: src/sys/arch/evbarm/lubbock/obio.c
diff -u src/sys/arch/evbarm/lubbock/obio.c:1.9 src/sys/arch/evbarm/lubbock/obio.c:1.10
--- src/sys/arch/evbarm/lubbock/obio.c:1.9 Fri May 29 14:15:44 2009
+++ src/sys/arch/evbarm/lubbock/obio.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.9 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: obio.c,v 1.10 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2011/07/01 20:42:37 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,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/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.4 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.5
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.4 Thu Jun 30 20:09:26 2011
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Fri Jul 1 20:42:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.4 2011/06/30 20:09:26 wiz Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.5 2011/07/01 20:42:37 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.4 2011/06/30 20:09:26 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.5 2011/07/01 20:42:37 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -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>
