Module Name: src Committed By: dyoung Date: Fri Jul 1 20:39:35 UTC 2011
Modified Files: src/sys/arch/evbarm/gemini: gemini_machdep.c src/sys/arch/evbarm/gumstix: gumstix_machdep.c gumstixvar.h gxlcd.c gxmci.c gxpcic.c if_sm_gxio.c src/sys/arch/evbarm/hdl_g: btn_obio.c com_obio.c hdlg_machdep.c hdlg_pci.c i80321_mainbus.c obio.c obio_space.c src/sys/arch/evbarm/ifpga: ifpga_io.c ifpgavar.h plcom_ifpga.c src/sys/arch/evbarm/integrator: int_bus_dma.h integrator_machdep.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/gemini/gemini_machdep.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/gumstix/gumstix_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gumstixvar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/gumstix/gxlcd.c \ src/sys/arch/evbarm/gumstix/gxmci.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gxpcic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/gumstix/if_sm_gxio.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/hdl_g/btn_obio.c \ src/sys/arch/evbarm/hdl_g/i80321_mainbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/com_obio.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/hdlg_pci.c \ src/sys/arch/evbarm/hdl_g/obio.c src/sys/arch/evbarm/hdl_g/obio_space.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ifpga/ifpga_io.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/ifpga/ifpgavar.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/ifpga/plcom_ifpga.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/integrator/int_bus_dma.h cvs rdiff -u -r1.67 -r1.68 \ src/sys/arch/evbarm/integrator/integrator_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/gemini/gemini_machdep.c diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.17 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.18 --- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.17 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/gemini/gemini_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $ */ /* adapted from: * NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp @@ -129,7 +129,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $"); #include "opt_machdep.h" #include "opt_ddb.h" @@ -166,7 +166,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/gumstix/gumstix_machdep.c diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.36 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.37 --- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.36 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gumstix_machdep.c,v 1.36 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: gumstix_machdep.c,v 1.37 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. * All rights reserved. @@ -165,7 +165,7 @@ #include <machine/autoconf.h> #include <machine/bootconfig.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/db_machdep.h> #include <machine/frame.h> Index: src/sys/arch/evbarm/gumstix/gumstixvar.h diff -u src/sys/arch/evbarm/gumstix/gumstixvar.h:1.5 src/sys/arch/evbarm/gumstix/gumstixvar.h:1.6 --- src/sys/arch/evbarm/gumstix/gumstixvar.h:1.5 Sun Nov 22 12:05:14 2009 +++ src/sys/arch/evbarm/gumstix/gumstixvar.h Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gumstixvar.h,v 1.5 2009/11/22 12:05:14 kiyohara Exp $ */ +/* $NetBSD: gumstixvar.h,v 1.6 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation. * All rights reserved. @@ -36,7 +36,7 @@ #include <sys/conf.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <arm/xscale/pxa2x0_gpio.h> #include <evbarm/gumstix/gumstixreg.h> Index: src/sys/arch/evbarm/gumstix/gxlcd.c diff -u src/sys/arch/evbarm/gumstix/gxlcd.c:1.2 src/sys/arch/evbarm/gumstix/gxlcd.c:1.3 --- src/sys/arch/evbarm/gumstix/gxlcd.c:1.2 Sat Nov 21 08:33:50 2009 +++ src/sys/arch/evbarm/gumstix/gxlcd.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $ */ +/* $NetBSD: gxlcd.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,7 +55,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> Index: src/sys/arch/evbarm/gumstix/gxmci.c diff -u src/sys/arch/evbarm/gumstix/gxmci.c:1.2 src/sys/arch/evbarm/gumstix/gxmci.c:1.3 --- src/sys/arch/evbarm/gumstix/gxmci.c:1.2 Sun Aug 9 06:12:34 2009 +++ src/sys/arch/evbarm/gumstix/gxmci.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gxmci.c,v 1.2 2009/08/09 06:12:34 kiyohara Exp $ */ +/* $NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /*- * Copyright (c) 2007 NONAKA Kimihiro <non...@netbsd.org> @@ -27,13 +27,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.2 2009/08/09 06:12:34 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <arm/xscale/pxa2x0cpu.h> Index: src/sys/arch/evbarm/gumstix/gxpcic.c diff -u src/sys/arch/evbarm/gumstix/gxpcic.c:1.11 src/sys/arch/evbarm/gumstix/gxpcic.c:1.12 --- src/sys/arch/evbarm/gumstix/gxpcic.c:1.11 Sun Aug 9 07:10:13 2009 +++ src/sys/arch/evbarm/gumstix/gxpcic.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gxpcic.c,v 1.11 2009/08/09 07:10:13 kiyohara Exp $ */ +/* $NetBSD: gxpcic.c,v 1.12 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation. * All rights reserved. @@ -71,7 +71,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/gumstix/if_sm_gxio.c diff -u src/sys/arch/evbarm/gumstix/if_sm_gxio.c:1.9 src/sys/arch/evbarm/gumstix/if_sm_gxio.c:1.10 --- src/sys/arch/evbarm/gumstix/if_sm_gxio.c:1.9 Sat Aug 28 04:33:00 2010 +++ src/sys/arch/evbarm/gumstix/if_sm_gxio.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sm_gxio.c,v 1.9 2010/08/28 04:33:00 kiyohara Exp $ */ +/* $NetBSD: if_sm_gxio.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation. * All rights reserved. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c,v 1.9 2010/08/28 04:33:00 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -80,7 +80,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/hdl_g/btn_obio.c diff -u src/sys/arch/evbarm/hdl_g/btn_obio.c:1.1 src/sys/arch/evbarm/hdl_g/btn_obio.c:1.2 --- src/sys/arch/evbarm/hdl_g/btn_obio.c:1.1 Sun Apr 16 02:22:33 2006 +++ src/sys/arch/evbarm/hdl_g/btn_obio.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: btn_obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $ */ +/* $NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $ */ /*- * Copyright (c) 2005, 2006 NONAKA Kimihiro @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -41,7 +41,7 @@ #include <arm/xscale/i80321var.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <dev/sysmon/sysmonvar.h> Index: src/sys/arch/evbarm/hdl_g/i80321_mainbus.c diff -u src/sys/arch/evbarm/hdl_g/i80321_mainbus.c:1.1 src/sys/arch/evbarm/hdl_g/i80321_mainbus.c:1.2 --- src/sys/arch/evbarm/hdl_g/i80321_mainbus.c:1.1 Sun Apr 16 02:22:33 2006 +++ src/sys/arch/evbarm/hdl_g/i80321_mainbus.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_mainbus.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $ */ +/* $NetBSD: i80321_mainbus.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -36,14 +36,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.2 2011/07/01 20:39:34 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/hdl_g/hdlgreg.h> #include <evbarm/hdl_g/hdlgvar.h> Index: src/sys/arch/evbarm/hdl_g/com_obio.c diff -u src/sys/arch/evbarm/hdl_g/com_obio.c:1.4 src/sys/arch/evbarm/hdl_g/com_obio.c:1.5 --- src/sys/arch/evbarm/hdl_g/com_obio.c:1.4 Mon Apr 28 20:23:16 2008 +++ src/sys/arch/evbarm/hdl_g/com_obio.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:16 martin Exp $ */ +/* $NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 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.4 2008/04/28 20:23:16 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 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/i80321var.h> Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.15 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.16 --- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.15 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hdlg_machdep.c,v 1.15 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: hdlg_machdep.c,v 1.16 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.15 2011/06/30 20:09:24 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.16 2011/07/01 20:39:34 dyoung Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -99,7 +99,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/hdl_g/hdlg_pci.c diff -u src/sys/arch/evbarm/hdl_g/hdlg_pci.c:1.2 src/sys/arch/evbarm/hdl_g/hdlg_pci.c:1.3 --- src/sys/arch/evbarm/hdl_g/hdlg_pci.c:1.2 Mon Apr 4 20:37:47 2011 +++ src/sys/arch/evbarm/hdl_g/hdlg_pci.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hdlg_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $ */ +/* $NetBSD: hdlg_pci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -36,14 +36,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdlg_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdlg_pci.c,v 1.3 2011/07/01 20:39:34 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/hdl_g/hdlgreg.h> #include <evbarm/hdl_g/hdlgvar.h> Index: src/sys/arch/evbarm/hdl_g/obio.c diff -u src/sys/arch/evbarm/hdl_g/obio.c:1.2 src/sys/arch/evbarm/hdl_g/obio.c:1.3 --- src/sys/arch/evbarm/hdl_g/obio.c:1.2 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/evbarm/hdl_g/obio.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: obio.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -36,14 +36,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3 2011/07/01 20:39:34 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/i80321reg.h> Index: src/sys/arch/evbarm/hdl_g/obio_space.c diff -u src/sys/arch/evbarm/hdl_g/obio_space.c:1.2 src/sys/arch/evbarm/hdl_g/obio_space.c:1.3 --- src/sys/arch/evbarm/hdl_g/obio_space.c:1.2 Sat Nov 7 07:27:42 2009 +++ src/sys/arch/evbarm/hdl_g/obio_space.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.2 2009/11/07 07:27:42 cegger Exp $ */ +/* $NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 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.2 2009/11/07 07:27:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 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/ifpga/ifpga_io.c diff -u src/sys/arch/evbarm/ifpga/ifpga_io.c:1.9 src/sys/arch/evbarm/ifpga/ifpga_io.c:1.10 --- src/sys/arch/evbarm/ifpga/ifpga_io.c:1.9 Sat Mar 14 21:04:08 2009 +++ src/sys/arch/evbarm/ifpga/ifpga_io.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ifpga_io.c,v 1.9 2009/03/14 21:04:08 dsl Exp $ */ +/* $NetBSD: ifpga_io.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 1997 Causality Limited @@ -41,11 +41,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.9 2009/03/14 21:04:08 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <uvm/uvm_extern.h> #include <evbarm/ifpga/ifpgavar.h> Index: src/sys/arch/evbarm/ifpga/ifpgavar.h diff -u src/sys/arch/evbarm/ifpga/ifpgavar.h:1.5 src/sys/arch/evbarm/ifpga/ifpgavar.h:1.6 --- src/sys/arch/evbarm/ifpga/ifpgavar.h:1.5 Tue Jul 21 16:04:16 2009 +++ src/sys/arch/evbarm/ifpga/ifpgavar.h Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ifpgavar.h,v 1.5 2009/07/21 16:04:16 dyoung Exp $ */ +/* $NetBSD: ifpgavar.h,v 1.6 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -32,7 +32,7 @@ #ifndef _IFPGAVAR_H_ #define _IFPGAVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> /* We statically map the UARTS at boot so that we can access the console before we've probed for the IFPGA. */ Index: src/sys/arch/evbarm/ifpga/plcom_ifpga.c diff -u src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.10 src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.11 --- src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.10 Tue Mar 28 17:38:24 2006 +++ src/sys/arch/evbarm/ifpga/plcom_ifpga.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom_ifpga.c,v 1.10 2006/03/28 17:38:24 thorpej Exp $ */ +/* $NetBSD: plcom_ifpga.c,v 1.11 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -32,7 +32,7 @@ /* Interface to plcom (PL010) serial driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.10 2006/03/28 17:38:24 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.11 2011/07/01 20:39:34 dyoung Exp $"); #include <sys/types.h> #include <sys/device.h> @@ -43,7 +43,7 @@ #include <sys/termios.h> #include <machine/intr.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <evbarm/dev/plcomreg.h> #include <evbarm/dev/plcomvar.h> Index: src/sys/arch/evbarm/integrator/int_bus_dma.h diff -u src/sys/arch/evbarm/integrator/int_bus_dma.h:1.2 src/sys/arch/evbarm/integrator/int_bus_dma.h:1.3 --- src/sys/arch/evbarm/integrator/int_bus_dma.h:1.2 Wed Jul 31 17:34:26 2002 +++ src/sys/arch/evbarm/integrator/int_bus_dma.h Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: int_bus_dma.h,v 1.2 2002/07/31 17:34:26 thorpej Exp $ */ +/* $NetBSD: int_bus_dma.h,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -32,7 +32,7 @@ #ifndef _INT_BUS_DMA_H #define _INT_BUS_DMA_H -#include <machine/bus.h> +#include <sys/bus.h> #define CM_ALIAS_TO_LOCAL(addr) (addr & 0x0fffffff) #define LOCAL_TO_CM_ALIAS(addr) (addr | 0x80000000) Index: src/sys/arch/evbarm/integrator/integrator_machdep.c diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.67 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.68 --- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.67 Thu Jun 30 20:09:24 2011 +++ src/sys/arch/evbarm/integrator/integrator_machdep.c Fri Jul 1 20:39:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: integrator_machdep.c,v 1.67 2011/06/30 20:09:24 wiz Exp $ */ +/* $NetBSD: integrator_machdep.c,v 1.68 2011/07/01 20:39:34 dyoung Exp $ */ /* * Copyright (c) 2001,2002 ARM Ltd @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.67 2011/06/30 20:09:24 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.68 2011/07/01 20:39:34 dyoung Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -93,7 +93,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 <machine/intr.h>