Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.
details: https://anonhg.NetBSD.org/src/rev/41522f251886
branches: trunk
changeset: 766774:41522f251886
user: dyoung <dyoung%NetBSD.org@localhost>
date: Fri Jul 01 20:26:35 2011 +0000
description:
#include <sys/bus.h> instead of <machine/bus.h>.
diffstat:
sys/arch/arm/imx/imx31_ahb.c | 6 +++---
sys/arch/arm/imx/imx31_aips.c | 8 ++++----
sys/arch/arm/imx/imx31_clock.c | 4 ++--
sys/arch/arm/imx/imx31_gpio.c | 6 +++---
sys/arch/arm/imx/imx31_icu.c | 6 +++---
sys/arch/arm/imx/imx51_clock.c | 6 +++---
sys/arch/arm/imx/imx51_gpio.c | 6 +++---
sys/arch/arm/imx/imx51_iomux.c | 6 +++---
sys/arch/arm/imx/imx51_tzic.c | 6 +++---
sys/arch/arm/imx/imx_dma.c | 6 +++---
sys/arch/arm/imx/imx_pcic.c | 8 ++++----
sys/arch/arm/imx/imx_space.c | 6 +++---
sys/arch/arm/imx/imxclock.c | 4 ++--
sys/arch/arm/imx/imxgpio.c | 6 +++---
sys/arch/arm/iomd/console/consinit.c | 6 +++---
sys/arch/arm/iomd/iomd.c | 6 +++---
sys/arch/arm/iomd/iomd_io.c | 6 +++---
sys/arch/arm/iomd/iomdkbc.c | 6 +++---
sys/arch/arm/iomd/iomdvar.h | 4 ++--
sys/arch/arm/iomd/qms.c | 6 +++---
sys/arch/arm/iomd/vidc20.c | 6 +++---
sys/arch/arm/iomd/vidcvideo.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_clk.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_com.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_intr.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_io.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0var.h | 4 ++--
sys/arch/arm/ixp12x0/ixpsip.c | 6 +++---
sys/arch/arm/ixp12x0/ixpsipvar.h | 4 ++--
sys/arch/arm/mainbus/mainbus.c | 6 +++---
sys/arch/arm/mainbus/mainbus.h | 4 ++--
sys/arch/arm/mainbus/mainbus_io.c | 6 +++---
sys/arch/arm/marvell/mvsoc_dma.c | 6 +++---
sys/arch/arm/marvell/mvsoc_space.c | 6 +++---
sys/arch/arm/marvell/mvsocrtc.c | 6 +++---
sys/arch/arm/marvell/mvsocvar.h | 4 ++--
sys/arch/arm/mpcore/dic.c | 6 +++---
sys/arch/arm/mpcore/mpcore_a2x_space.c | 4 ++--
sys/arch/arm/mpcore/mpcore_a4x_space.c | 6 +++---
sys/arch/arm/mpcore/mpcore_clock.c | 6 +++---
sys/arch/arm/mpcore/mpcore_pmr.c | 6 +++---
sys/arch/arm/mpcore/mpcore_space.c | 4 ++--
sys/arch/arm/omap/obio_com.c | 6 +++---
sys/arch/arm/omap/obio_mputmr.c | 6 +++---
sys/arch/arm/omap/obio_ohci.c | 8 ++++----
sys/arch/arm/omap/obio_wdt.c | 4 ++--
sys/arch/arm/omap/omap2430_intr.c | 6 +++---
sys/arch/arm/omap/omap2_gpio.c | 6 +++---
sys/arch/arm/omap/omap2_gpmc.c | 8 ++++----
sys/arch/arm/omap/omap2_icu.c | 6 +++---
sys/arch/arm/omap/omap2_l3i.c | 8 ++++----
sys/arch/arm/omap/omap2_mputmr.c | 6 +++---
sys/arch/arm/omap/omap2_nand.c | 6 +++---
sys/arch/arm/omap/omap2_obio.c | 8 ++++----
sys/arch/arm/omap/omap2_prcm.c | 6 +++---
sys/arch/arm/omap/omap5912_intr.c | 6 +++---
sys/arch/arm/omap/omap_a2x_space.c | 6 +++---
sys/arch/arm/omap/omap_a4x_space.c | 6 +++---
sys/arch/arm/omap/omap_com.c | 6 +++---
sys/arch/arm/omap/omap_dma.c | 6 +++---
sys/arch/arm/omap/omap_emifs.c | 6 +++---
sys/arch/arm/omap/omap_gpio.c | 6 +++---
sys/arch/arm/omap/omap_intr.c | 6 +++---
sys/arch/arm/omap/omap_mputmr.c | 6 +++---
sys/arch/arm/omap/omap_nobyteacc_space.c | 6 +++---
sys/arch/arm/omap/omap_ocp.c | 6 +++---
sys/arch/arm/omap/omap_rtc.c | 6 +++---
sys/arch/arm/omap/omap_space.c | 6 +++---
sys/arch/arm/omap/omap_tipb.c | 6 +++---
sys/arch/arm/omap/omap_var.h | 2 +-
sys/arch/arm/omap/omap_wdt.c | 2 +-
sys/arch/arm/omap/omap_wdtvar.h | 2 +-
sys/arch/arm/omap/omapfb.c | 6 +++---
sys/arch/arm/s3c2xx0/ohci_s3c24x0.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2410.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2410_extint.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2410_intr.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2410_spi.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c24x0_clk.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c24x0_lcd.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c24x0_lcd.h | 4 ++--
sys/arch/arm/s3c2xx0/s3c2800.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2800_clk.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2800_intr.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2xx0_intr.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2xx0_space.c | 6 +++---
sys/arch/arm/s3c2xx0/s3c2xx0var.h | 4 ++--
sys/arch/arm/s3c2xx0/sscom_s3c2410.c | 6 +++---
sys/arch/arm/s3c2xx0/sscom_s3c2800.c | 6 +++---
sys/arch/arm/s3c2xx0/sscom_var.h | 4 ++--
sys/arch/arm/sa11x0/sa1111.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0_com.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0_io.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0_ost.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0_var.h | 4 ++--
sys/arch/arm/sa11x0/sa11x1_pcic.c | 6 +++---
sys/arch/arm/xscale/becc.c | 6 +++---
sys/arch/arm/xscale/becc_pci.c | 6 +++---
sys/arch/arm/xscale/becc_space.c | 6 +++---
sys/arch/arm/xscale/becc_timer.c | 6 +++---
sys/arch/arm/xscale/i80312.c | 6 +++---
sys/arch/arm/xscale/i80312_gpio.c | 6 +++---
sys/arch/arm/xscale/i80312_i2c.c | 6 +++---
sys/arch/arm/xscale/i80312_mem.c | 6 +++---
sys/arch/arm/xscale/i80312_pci.c | 6 +++---
sys/arch/arm/xscale/i80312_space.c | 6 +++---
sys/arch/arm/xscale/i80312var.h | 4 ++--
sys/arch/arm/xscale/i80321.c | 6 +++---
sys/arch/arm/xscale/i80321_gpio.c | 4 ++--
sys/arch/arm/xscale/i80321_i2c.c | 6 +++---
sys/arch/arm/xscale/i80321_icu.c | 6 +++---
sys/arch/arm/xscale/i80321_mcu.c | 6 +++---
sys/arch/arm/xscale/i80321_pci.c | 6 +++---
sys/arch/arm/xscale/i80321_space.c | 6 +++---
sys/arch/arm/xscale/i80321_timer.c | 6 +++---
sys/arch/arm/xscale/i80321_wdog.c | 6 +++---
sys/arch/arm/xscale/iopi2c.c | 6 +++---
sys/arch/arm/xscale/ixp425.c | 6 +++---
sys/arch/arm/xscale/ixp425_a4x_space.c | 6 +++---
sys/arch/arm/xscale/ixp425_com.c | 6 +++---
sys/arch/arm/xscale/ixp425_if_npe.c | 6 +++---
sys/arch/arm/xscale/ixp425_intr.c | 6 +++---
sys/arch/arm/xscale/ixp425_ixme.c | 6 +++---
sys/arch/arm/xscale/ixp425_npe.c | 6 +++---
sys/arch/arm/xscale/ixp425_pci.c | 6 +++---
sys/arch/arm/xscale/ixp425_pci_dma.c | 6 +++---
sys/arch/arm/xscale/ixp425_pci_space.c | 6 +++---
sys/arch/arm/xscale/ixp425_qmgr.c | 6 +++---
sys/arch/arm/xscale/ixp425_sip.c | 6 +++---
sys/arch/arm/xscale/ixp425_sipvar.h | 4 ++--
sys/arch/arm/xscale/ixp425_space.c | 6 +++---
sys/arch/arm/xscale/ixp425_timer.c | 6 +++---
sys/arch/arm/xscale/ixp425_wdog.c | 6 +++---
sys/arch/arm/xscale/ixp425var.h | 4 ++--
sys/arch/arm/xscale/pxa2x0.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_a4x_space.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_ac97.c | 4 ++--
sys/arch/arm/xscale/pxa2x0_apm.h | 4 ++--
sys/arch/arm/xscale/pxa2x0_com.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_dma.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_dmac.c | 4 ++--
sys/arch/arm/xscale/pxa2x0_gpio.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_i2s.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_i2s.h | 4 ++--
sys/arch/arm/xscale/pxa2x0_intr.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_lcd.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_lcd.h | 4 ++--
sys/arch/arm/xscale/pxa2x0_ohci.c | 4 ++--
sys/arch/arm/xscale/pxa2x0_pcic.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_rtc.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_space.c | 6 +++---
sys/arch/arm/xscale/pxa2x0_udc.c | 4 ++--
sys/arch/atari/atari/be_bus.c | 6 +++---
sys/arch/atari/atari/bus.c | 6 +++---
sys/arch/atari/atari/le_bus.c | 6 +++---
sys/arch/atari/atari/mainbus.c | 6 +++---
sys/arch/atari/dev/hdfd.c | 6 +++---
sys/arch/atari/dev/wdc_mb.c | 6 +++---
sys/arch/atari/isa/fdcisa.c | 6 +++---
sys/arch/atari/isa/isa_dma.c | 6 +++---
sys/arch/atari/isa/isa_machdep.c | 6 +++---
sys/arch/atari/isa/isapnp_machdep.c | 6 +++---
sys/arch/atari/pci/pci_hades.c | 6 +++---
sys/arch/atari/pci/pci_machdep.c | 6 +++---
sys/arch/atari/vme/if_le_vme.c | 6 +++---
sys/arch/atari/vme/leo.c | 6 +++---
sys/arch/atari/vme/vme_machdep.c | 6 +++---
sys/arch/atari/vme/vmevar.h | 4 ++--
sys/arch/bebox/bebox/cpu.c | 6 +++---
sys/arch/bebox/bebox/mainbus.c | 6 +++---
sys/arch/bebox/isa/mcclock_isa.c | 6 +++---
sys/arch/bebox/pci/pci_machdep.c | 6 +++---
sys/arch/cats/cats/cats_machdep.c | 6 +++---
sys/arch/cats/pci/pcib.c | 6 +++---
179 files changed, 511 insertions(+), 511 deletions(-)
diffs (truncated from 4528 to 300 lines):
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx31_ahb.c
--- a/sys/arch/arm/imx/imx31_ahb.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx31_ahb.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx31_aips.c
--- a/sys/arch/arm/imx/imx31_aips.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx31_aips.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx31_clock.c
--- a/sys/arch/arm/imx/imx31_clock.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx31_clock.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx31_gpio.c
--- a/sys/arch/arm/imx/imx31_gpio.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx31_gpio.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx31_icu.c
--- a/sys/arch/arm/imx/imx31_icu.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx31_icu.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx51_clock.c
--- a/sys/arch/arm/imx/imx51_clock.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx51_clock.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx51_gpio.c
--- a/sys/arch/arm/imx/imx51_gpio.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx51_gpio.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx51_iomux.c
--- a/sys/arch/arm/imx/imx51_iomux.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx51_iomux.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx51_tzic.c
--- a/sys/arch/arm/imx/imx51_tzic.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx51_tzic.c Fri Jul 01 20:26:35 2011 +0000
@@ -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 <ryo%nerv.org@localhost>
@@ -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>
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx_dma.c
--- a/sys/arch/arm/imx/imx_dma.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx_dma.c Fri Jul 01 20:26:35 2011 +0000
@@ -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,
diff -r 2dbaa8a67858 -r 41522f251886 sys/arch/arm/imx/imx_pcic.c
--- a/sys/arch/arm/imx/imx_pcic.c Fri Jul 01 18:51:52 2011 +0000
+++ b/sys/arch/arm/imx/imx_pcic.c Fri Jul 01 20:26:35 2011 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index