Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:27:50 UTC 2011
Modified Files:
src/sys/arch/arm/imx: imx31_ahb.c imx31_aips.c imx31_clock.c
imx31_gpio.c imx31_icu.c imx51_clock.c imx51_gpio.c imx51_iomux.c
imx51_tzic.c imx_dma.c imx_pcic.c imx_space.c imxclock.c imxgpio.c
src/sys/arch/arm/ixp12x0: ixp12x0.c ixp12x0_clk.c ixp12x0_com.c
ixp12x0_intr.c ixp12x0_io.c ixp12x0_pci_dma.c ixp12x0var.h ixpsip.c
ixpsipvar.h
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/arm/imx/imx31_ahb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx31_aips.c \
src/sys/arch/arm/imx/imx_pcic.c src/sys/arch/arm/imx/imxclock.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx31_clock.c \
src/sys/arch/arm/imx/imx51_tzic.c src/sys/arch/arm/imx/imx_space.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx31_gpio.c \
src/sys/arch/arm/imx/imx31_icu.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_clock.c \
src/sys/arch/arm/imx/imx51_gpio.c src/sys/arch/arm/imx/imx51_iomux.c \
src/sys/arch/arm/imx/imx_dma.c src/sys/arch/arm/imx/imxgpio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ixp12x0/ixp12x0.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/ixp12x0/ixp12x0_clk.c \
src/sys/arch/arm/ixp12x0/ixp12x0_io.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/ixp12x0/ixp12x0_com.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ixp12x0/ixp12x0var.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ixp12x0/ixpsip.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ixp12x0/ixpsipvar.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/arch/arm/imx/imx31_ahb.c
diff -u src/sys/arch/arm/imx/imx31_ahb.c:1.4 src/sys/arch/arm/imx/imx31_ahb.c:1.5
--- src/sys/arch/arm/imx/imx31_ahb.c:1.4 Sat Nov 13 05:00:31 2010
+++ src/sys/arch/arm/imx/imx31_ahb.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $ */
+/* $NetBSD: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.5 2011/07/01 20:27:50 dyoung Exp $");
#include "locators.h"
#include "avic.h"
@@ -112,7 +112,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: src/sys/arch/arm/imx/imx31_aips.c
diff -u src/sys/arch/arm/imx/imx31_aips.c:1.3 src/sys/arch/arm/imx/imx31_aips.c:1.4
--- src/sys/arch/arm/imx/imx31_aips.c:1.3 Fri May 2 22:00:29 2008
+++ src/sys/arch/arm/imx/imx31_aips.c Fri Jul 1 20:27:50 2011
@@ -1,7 +1,7 @@
-/* $Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
+/* $Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
/* derived from: */
-/* $NetBSD: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
+/* $NetBSD: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $");
#include "locators.h"
@@ -113,7 +113,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: src/sys/arch/arm/imx/imx_pcic.c
diff -u src/sys/arch/arm/imx/imx_pcic.c:1.3 src/sys/arch/arm/imx/imx_pcic.c:1.4
--- src/sys/arch/arm/imx/imx_pcic.c:1.3 Mon Jun 30 00:46:41 2008
+++ src/sys/arch/arm/imx/imx_pcic.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $ */
+/* $Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
/*
* IMX CF interface to pcic/pcmcia
@@ -6,7 +6,7 @@
* Sun Apr 1 21:42:37 PDT 2007
*/
-/* $NetBSD: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $ */
+/* $NetBSD: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
/* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.3 2008/06/30 00:46:41 perry Exp $");
+__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@
#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/arm/imx/imxclock.c
diff -u src/sys/arch/arm/imx/imxclock.c:1.3 src/sys/arch/arm/imx/imxclock.c:1.4
--- src/sys/arch/arm/imx/imxclock.c:1.3 Sat Nov 13 06:51:37 2010
+++ src/sys/arch/arm/imx/imxclock.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imxclock.c,v 1.3 2010/11/13 06:51:37 bsh Exp $ */
+/* $NetBSD: imxclock.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec corp. All rights reserved.
* Written by Hashimoto Kenichi for Genetec corp.
@@ -41,7 +41,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: src/sys/arch/arm/imx/imx31_clock.c
diff -u src/sys/arch/arm/imx/imx31_clock.c:1.2 src/sys/arch/arm/imx/imx31_clock.c:1.3
--- src/sys/arch/arm/imx/imx31_clock.c:1.2 Mon Nov 15 18:19:19 2010
+++ src/sys/arch/arm/imx/imx31_clock.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31_clock.c,v 1.2 2010/11/15 18:19:19 bsh Exp $ */
+/* $NetBSD: imx31_clock.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2009,2010 Genetec corp. All rights reserved.
* Written by Hashimoto Kenichi for Genetec corp.
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: src/sys/arch/arm/imx/imx51_tzic.c
diff -u src/sys/arch/arm/imx/imx51_tzic.c:1.2 src/sys/arch/arm/imx/imx51_tzic.c:1.3
--- src/sys/arch/arm/imx/imx51_tzic.c:1.2 Mon Dec 20 00:25:28 2010
+++ src/sys/arch/arm/imx/imx51_tzic.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_tzic.c,v 1.2 2010/12/20 00:25:28 matt Exp $ */
+/* $NetBSD: imx51_tzic.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
/*-
* Copyright (c) 2010 SHIMIZU Ryo <r...@nerv.org>
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.2 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $");
#define _INTR_PRIVATE /* for arm/pic/picvar.h */
@@ -38,7 +38,7 @@
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/imx/imx_space.c
diff -u src/sys/arch/arm/imx/imx_space.c:1.2 src/sys/arch/arm/imx/imx_space.c:1.3
--- src/sys/arch/arm/imx/imx_space.c:1.2 Sat Nov 13 05:00:31 2010
+++ src/sys/arch/arm/imx/imx_space.c Fri Jul 1 20:27:50 2011
@@ -1,7 +1,7 @@
-/* $Id: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
+/* $Id: imx_space.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
/* derived from: */
-/* $NetBSD: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
+/* $NetBSD: imx_space.c,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
bs_protos(imx);
bs_protos(generic);
Index: src/sys/arch/arm/imx/imx31_gpio.c
diff -u src/sys/arch/arm/imx/imx31_gpio.c:1.5 src/sys/arch/arm/imx/imx31_gpio.c:1.6
--- src/sys/arch/arm/imx/imx31_gpio.c:1.5 Mon Nov 15 18:18:39 2010
+++ src/sys/arch/arm/imx/imx31_gpio.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31_gpio.c,v 1.5 2010/11/15 18:18:39 bsh Exp $ */
+/* $NetBSD: imx31_gpio.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.5 2010/11/15 18:18:39 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $");
#define _INTR_PRIVATE
@@ -47,7 +47,7 @@
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
Index: src/sys/arch/arm/imx/imx31_icu.c
diff -u src/sys/arch/arm/imx/imx31_icu.c:1.5 src/sys/arch/arm/imx/imx31_icu.c:1.6
--- src/sys/arch/arm/imx/imx31_icu.c:1.5 Wed Nov 19 06:28:14 2008
+++ src/sys/arch/arm/imx/imx31_icu.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31_icu.c,v 1.5 2008/11/19 06:28:14 matt Exp $ */
+/* $NetBSD: imx31_icu.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.5 2008/11/19 06:28:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.6 2011/07/01 20:27:50 dyoung Exp $");
#define _INTR_PRIVATE
@@ -48,7 +48,7 @@
#include <arm/cpufunc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
Index: src/sys/arch/arm/imx/imx51_clock.c
diff -u src/sys/arch/arm/imx/imx51_clock.c:1.1 src/sys/arch/arm/imx/imx51_clock.c:1.2
--- src/sys/arch/arm/imx/imx51_clock.c:1.1 Sat Nov 13 06:51:37 2010
+++ src/sys/arch/arm/imx/imx51_clock.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_clock.c,v 1.1 2010/11/13 06:51:37 bsh Exp $ */
+/* $NetBSD: imx51_clock.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2009 Genetec corp. All rights reserved.
* Written by Hashimoto Kenichi for Genetec corp.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_clock.c,v 1.1 2010/11/13 06:51:37 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_clock.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <dev/clock_subr.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/imx/imx51_gpio.c
diff -u src/sys/arch/arm/imx/imx51_gpio.c:1.1 src/sys/arch/arm/imx/imx51_gpio.c:1.2
--- src/sys/arch/arm/imx/imx51_gpio.c:1.1 Tue Nov 30 13:05:27 2010
+++ src/sys/arch/arm/imx/imx51_gpio.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_gpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $ */
+/* $NetBSD: imx51_gpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
/* derived from imx31_gpio.c */
/*-
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
#include "locators.h"
#include "gpio.h"
@@ -45,7 +45,7 @@
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx51reg.h>
#include <arm/imx/imx51var.h>
Index: src/sys/arch/arm/imx/imx51_iomux.c
diff -u src/sys/arch/arm/imx/imx51_iomux.c:1.1 src/sys/arch/arm/imx/imx51_iomux.c:1.2
--- src/sys/arch/arm/imx/imx51_iomux.c:1.1 Tue Nov 30 13:05:27 2010
+++ src/sys/arch/arm/imx/imx51_iomux.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_iomux.c,v 1.1 2010/11/30 13:05:27 bsh Exp $ */
+/* $NetBSD: imx51_iomux.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_iomux.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_iomux.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
#define _INTR_PRIVATE
@@ -45,7 +45,7 @@
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx51reg.h>
#include <arm/imx/imx51var.h>
Index: src/sys/arch/arm/imx/imx_dma.c
diff -u src/sys/arch/arm/imx/imx_dma.c:1.1 src/sys/arch/arm/imx/imx_dma.c:1.2
--- src/sys/arch/arm/imx/imx_dma.c:1.1 Sat Nov 13 07:11:03 2010
+++ src/sys/arch/arm/imx/imx_dma.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imx_dma.c,v 1.1 2010/11/13 07:11:03 bsh Exp $ */
+/* $NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2009 Genetec Corporation. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.1 2010/11/13 07:11:03 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag imx_bus_dma_tag = {
0,
Index: src/sys/arch/arm/imx/imxgpio.c
diff -u src/sys/arch/arm/imx/imxgpio.c:1.1 src/sys/arch/arm/imx/imxgpio.c:1.2
--- src/sys/arch/arm/imx/imxgpio.c:1.1 Tue Nov 30 13:05:27 2010
+++ src/sys/arch/arm/imx/imxgpio.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: imxgpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $ */
+/* $NetBSD: imxgpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v 1.2 2011/07/01 20:27:50 dyoung Exp $");
#define _INTR_PRIVATE
@@ -48,7 +48,7 @@
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0.c:1.17 src/sys/arch/arm/ixp12x0/ixp12x0.c:1.18
--- src/sys/arch/arm/ixp12x0/ixp12x0.c:1.17 Tue May 17 17:34:48 2011
+++ src/sys/arch/arm/ixp12x0/ixp12x0.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0.c,v 1.17 2011/05/17 17:34:48 dyoung Exp $ */
+/* $NetBSD: ixp12x0.c,v 1.18 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v 1.17 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v 1.18 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0reg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0_clk.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.14 src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.15
--- src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.14 Sat May 10 15:31:04 2008
+++ src/sys/arch/arm/ixp12x0/ixp12x0_clk.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_clk.c,v 1.14 2008/05/10 15:31:04 martin Exp $ */
+/* $NetBSD: ixp12x0_clk.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.14 2008/05/10 15:31:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -49,7 +49,7 @@
#include <sys/timetc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0_io.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.14 src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.15
--- src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.14 Sat Nov 7 07:27:41 2009
+++ src/sys/arch/arm/ixp12x0/ixp12x0_io.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_io.c,v 1.14 2009/11/07 07:27:41 cegger Exp $ */
+/* $NetBSD: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.14 2009/11/07 07:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.15 2011/07/01 20:27:50 dyoung Exp $");
/*
* bus_space I/O functions for ixp12x0
@@ -40,7 +40,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0reg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0_com.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.38 src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.39
--- src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.38 Sun Apr 24 16:26:54 2011
+++ src/sys/arch/arm/ixp12x0/ixp12x0_com.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_com.c,v 1.38 2011/04/24 16:26:54 rmind Exp $ */
+/* $NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.38 2011/04/24 16:26:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.39 2011/07/01 20:27:50 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -91,7 +91,7 @@
#include <sys/lwp.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/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.21 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.22
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.21 Mon Dec 20 00:25:28 2010
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.21 2010/12/20 00:25:28 matt Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.21 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $");
/*
* Interrupt support for the Intel ixp12x0
@@ -42,7 +42,7 @@
#include <sys/simplelock.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c:1.7 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c:1.8
--- src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c:1.7 Wed Oct 21 14:15:50 2009
+++ src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $ */
+/* $NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002, 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.8 2011/07/01 20:27:50 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0_pcireg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: src/sys/arch/arm/ixp12x0/ixp12x0var.h
diff -u src/sys/arch/arm/ixp12x0/ixp12x0var.h:1.8 src/sys/arch/arm/ixp12x0/ixp12x0var.h:1.9
--- src/sys/arch/arm/ixp12x0/ixp12x0var.h:1.8 Wed Oct 21 14:15:50 2009
+++ src/sys/arch/arm/ixp12x0/ixp12x0var.h Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0var.h,v 1.8 2009/10/21 14:15:50 rmind Exp $ */
+/* $NetBSD: ixp12x0var.h,v 1.9 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -33,7 +33,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/arm/ixp12x0/ixpsip.c
diff -u src/sys/arch/arm/ixp12x0/ixpsip.c:1.12 src/sys/arch/arm/ixp12x0/ixpsip.c:1.13
--- src/sys/arch/arm/ixp12x0/ixpsip.c:1.12 Wed Oct 21 14:15:50 2009
+++ src/sys/arch/arm/ixp12x0/ixpsip.c Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $ */
+/* $NetBSD: ixpsip.c,v 1.13 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.13 2011/07/01 20:27:50 dyoung Exp $");
/*
* Slow peripheral bus of ixp12x0 Processor
@@ -39,7 +39,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0var.h>
#include <arm/ixp12x0/ixpsipvar.h>
Index: src/sys/arch/arm/ixp12x0/ixpsipvar.h
diff -u src/sys/arch/arm/ixp12x0/ixpsipvar.h:1.2 src/sys/arch/arm/ixp12x0/ixpsipvar.h:1.3
--- src/sys/arch/arm/ixp12x0/ixpsipvar.h:1.2 Wed Oct 21 14:15:50 2009
+++ src/sys/arch/arm/ixp12x0/ixpsipvar.h Fri Jul 1 20:27:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpsipvar.h,v 1.2 2009/10/21 14:15:50 rmind Exp $ */
+/* $NetBSD: ixpsipvar.h,v 1.3 2011/07/01 20:27:50 dyoung Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -33,7 +33,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ixpsip_softc {
struct device sc_dev;
