Module Name: src Committed By: dyoung Date: Fri Jul 1 18:53:48 UTC 2011
Modified Files: src/sys/arch/sgimips/dev: crime.c crimevar.h crmfb.c ctl.c dpclock.c dsclock.c imc.c int.c pic.c src/sys/arch/sgimips/eisa: eisa_machdep.c src/sys/arch/sgimips/gio: gio.c giovar.h grtwovar.h lightvar.h newportvar.h pci_gio.c src/sys/arch/sgimips/hpc: haltwo.c hpc.c hpcdma.c hpcdma.h if_sq.c pi1ppc.c pi1ppcvar.h wdsc.c src/sys/arch/sgimips/ioc: ioc.c oioc.c oiocsc.c oiocvar.h src/sys/arch/sgimips/mace: com_mace.c if_mec.c lpt_mace.c mace.c macekbc.c mavb.c mcclock_mace.c pci_mace.c src/sys/arch/sgimips/pci: pci_machdep.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sgimips/dev/crime.c \ src/sys/arch/sgimips/dev/crmfb.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sgimips/dev/crimevar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/dev/ctl.c \ src/sys/arch/sgimips/dev/dpclock.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sgimips/dev/dsclock.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/dev/imc.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sgimips/dev/int.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/dev/pic.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/eisa/eisa_machdep.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/gio/gio.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/gio/giovar.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/gio/grtwovar.h \ src/sys/arch/sgimips/gio/newportvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/gio/lightvar.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/gio/pci_gio.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/hpc/haltwo.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sgimips/hpc/hpc.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/hpc/hpcdma.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/hpc/hpcdma.h \ src/sys/arch/sgimips/hpc/pi1ppc.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sgimips/hpc/if_sq.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/hpc/pi1ppcvar.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/hpc/wdsc.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/ioc/ioc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/ioc/oioc.c \ src/sys/arch/sgimips/ioc/oiocsc.c src/sys/arch/sgimips/ioc/oiocvar.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/mace/com_mace.c \ src/sys/arch/sgimips/mace/lpt_mace.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sgimips/mace/if_mec.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/mace/mace.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/mace/macekbc.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/mace/mavb.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/mace/mcclock_mace.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sgimips/mace/pci_mace.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/pci/pci_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/sgimips/dev/crime.c diff -u src/sys/arch/sgimips/dev/crime.c:1.34 src/sys/arch/sgimips/dev/crime.c:1.35 --- src/sys/arch/sgimips/dev/crime.c:1.34 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/dev/crime.c Fri Jul 1 18:53:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $ */ /* * Copyright (c) 2004 Christopher SEKIYA @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.34 2011/02/20 07:59:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.35 2011/07/01 18:53:45 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -48,7 +48,7 @@ #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/dev/crmfb.c diff -u src/sys/arch/sgimips/dev/crmfb.c:1.34 src/sys/arch/sgimips/dev/crmfb.c:1.35 --- src/sys/arch/sgimips/dev/crmfb.c:1.34 Tue May 17 22:52:28 2011 +++ src/sys/arch/sgimips/dev/crmfb.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $ */ +/* $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.34 2011/05/17 22:52:28 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ #define _SGIMIPS_BUS_DMA_PRIVATE #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/vmparam.h> Index: src/sys/arch/sgimips/dev/crimevar.h diff -u src/sys/arch/sgimips/dev/crimevar.h:1.7 src/sys/arch/sgimips/dev/crimevar.h:1.8 --- src/sys/arch/sgimips/dev/crimevar.h:1.7 Wed Oct 17 19:57:03 2007 +++ src/sys/arch/sgimips/dev/crimevar.h Fri Jul 1 18:53:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crimevar.h,v 1.7 2007/10/17 19:57:03 garbled Exp $ */ +/* $NetBSD: crimevar.h,v 1.8 2011/07/01 18:53:45 dyoung Exp $ */ /* * Copyright (c) 2003 Christopher SEKIYA @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <machine/bus.h> +#include <sys/bus.h> struct crime_softc { struct device sc_dev; Index: src/sys/arch/sgimips/dev/ctl.c diff -u src/sys/arch/sgimips/dev/ctl.c:1.2 src/sys/arch/sgimips/dev/ctl.c:1.3 --- src/sys/arch/sgimips/dev/ctl.c:1.2 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/dev/ctl.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ctl.c,v 1.2 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: ctl.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ctl.c,v 1.2 2011/02/20 07:59:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ctl.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -39,7 +39,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/dev/dpclock.c diff -u src/sys/arch/sgimips/dev/dpclock.c:1.2 src/sys/arch/sgimips/dev/dpclock.c:1.3 --- src/sys/arch/sgimips/dev/dpclock.c:1.2 Sat Dec 12 14:44:09 2009 +++ src/sys/arch/sgimips/dev/dpclock.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dpclock.c,v 1.2 2009/12/12 14:44:09 tsutsui Exp $ */ +/* $NetBSD: dpclock.c,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2001 Erik Reid @@ -39,7 +39,7 @@ #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/sysconf.h> #include <machine/machtype.h> Index: src/sys/arch/sgimips/dev/dsclock.c diff -u src/sys/arch/sgimips/dev/dsclock.c:1.4 src/sys/arch/sgimips/dev/dsclock.c:1.5 --- src/sys/arch/sgimips/dev/dsclock.c:1.4 Tue Jan 12 15:20:29 2010 +++ src/sys/arch/sgimips/dev/dsclock.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dsclock.c,v 1.4 2010/01/12 15:20:29 tsutsui Exp $ */ +/* $NetBSD: dsclock.c,v 1.5 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -34,14 +34,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dsclock.c,v 1.4 2010/01/12 15:20:29 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dsclock.c,v 1.5 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/sysconf.h> #include <machine/machtype.h> Index: src/sys/arch/sgimips/dev/imc.c diff -u src/sys/arch/sgimips/dev/imc.c:1.31 src/sys/arch/sgimips/dev/imc.c:1.32 --- src/sys/arch/sgimips/dev/imc.c:1.31 Thu Jun 30 20:09:35 2011 +++ src/sys/arch/sgimips/dev/imc.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: imc.c,v 1.31 2011/06/30 20:09:35 wiz Exp $ */ +/* $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.31 2011/06/30 20:09:35 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -37,7 +37,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/dev/int.c diff -u src/sys/arch/sgimips/dev/int.c:1.23 src/sys/arch/sgimips/dev/int.c:1.24 --- src/sys/arch/sgimips/dev/int.c:1.23 Thu Mar 10 17:32:46 2011 +++ src/sys/arch/sgimips/dev/int.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $ */ +/* $NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $"); #define __INTR_PRIVATE #include "opt_cputype.h" @@ -49,7 +49,7 @@ #include <dev/ic/i8253reg.h> #include <machine/sysconf.h> #include <machine/machtype.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <mips/locore.h> #include <mips/cache.h> Index: src/sys/arch/sgimips/dev/pic.c diff -u src/sys/arch/sgimips/dev/pic.c:1.14 src/sys/arch/sgimips/dev/pic.c:1.15 --- src/sys/arch/sgimips/dev/pic.c:1.14 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/dev/pic.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pic.c,v 1.14 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: pic.c,v 1.15 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2002 Steve Rumble @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.14 2011/02/20 07:59:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.15 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -37,7 +37,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/eisa/eisa_machdep.c diff -u src/sys/arch/sgimips/eisa/eisa_machdep.c:1.6 src/sys/arch/sgimips/eisa/eisa_machdep.c:1.7 --- src/sys/arch/sgimips/eisa/eisa_machdep.c:1.6 Sat Mar 14 21:04:15 2009 +++ src/sys/arch/sgimips/eisa/eisa_machdep.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: eisa_machdep.c,v 1.6 2009/03/14 21:04:15 dsl Exp $ */ +/* $NetBSD: eisa_machdep.c,v 1.7 2011/07/01 18:53:46 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.6 2009/03/14 21:04:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.7 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -75,7 +75,7 @@ #include <sys/device.h> #include <sys/extent.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/eisa/eisavar.h> void Index: src/sys/arch/sgimips/gio/gio.c diff -u src/sys/arch/sgimips/gio/gio.c:1.31 src/sys/arch/sgimips/gio/gio.c:1.32 --- src/sys/arch/sgimips/gio/gio.c:1.31 Wed Mar 18 10:22:35 2009 +++ src/sys/arch/sgimips/gio/gio.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gio.c,v 1.31 2009/03/18 10:22:35 cegger Exp $ */ +/* $NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.31 2009/03/18 10:22:35 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $"); #include "opt_ddb.h" @@ -42,7 +42,7 @@ #include <sys/device.h> #define _SGIMIPS_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/gio/giovar.h diff -u src/sys/arch/sgimips/gio/giovar.h:1.9 src/sys/arch/sgimips/gio/giovar.h:1.10 --- src/sys/arch/sgimips/gio/giovar.h:1.9 Mon Feb 19 20:14:30 2007 +++ src/sys/arch/sgimips/gio/giovar.h Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: giovar.h,v 1.9 2007/02/19 20:14:30 rumble Exp $ */ +/* $NetBSD: giovar.h,v 1.10 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -36,7 +36,7 @@ * GIO 32/32-bis/64 bus */ -#include <machine/bus.h> +#include <sys/bus.h> struct giobus_attach_args { bus_space_tag_t gba_iot; Index: src/sys/arch/sgimips/gio/grtwovar.h diff -u src/sys/arch/sgimips/gio/grtwovar.h:1.2 src/sys/arch/sgimips/gio/grtwovar.h:1.3 --- src/sys/arch/sgimips/gio/grtwovar.h:1.2 Sun Dec 11 12:18:53 2005 +++ src/sys/arch/sgimips/gio/grtwovar.h Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: grtwovar.h,v 1.2 2005/12/11 12:18:53 christos Exp $ */ +/* $NetBSD: grtwovar.h,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2004 Christopher SEKIYA @@ -32,7 +32,7 @@ #ifndef _ARCH_SGIMIPS_GIO_GRTWOVAR_H_ #define _ARCH_SGIMIPS_GIO_GRTWOVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> int grtwo_cnattach(struct gio_attach_args *); Index: src/sys/arch/sgimips/gio/newportvar.h diff -u src/sys/arch/sgimips/gio/newportvar.h:1.2 src/sys/arch/sgimips/gio/newportvar.h:1.3 --- src/sys/arch/sgimips/gio/newportvar.h:1.2 Sun Dec 11 12:18:53 2005 +++ src/sys/arch/sgimips/gio/newportvar.h Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: newportvar.h,v 1.2 2005/12/11 12:18:53 christos Exp $ */ +/* $NetBSD: newportvar.h,v 1.3 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -32,7 +32,7 @@ #ifndef _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_ #define _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> int newport_cnattach(struct gio_attach_args *); Index: src/sys/arch/sgimips/gio/lightvar.h diff -u src/sys/arch/sgimips/gio/lightvar.h:1.1 src/sys/arch/sgimips/gio/lightvar.h:1.2 --- src/sys/arch/sgimips/gio/lightvar.h:1.1 Tue Dec 26 04:28:16 2006 +++ src/sys/arch/sgimips/gio/lightvar.h Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $Id: lightvar.h,v 1.1 2006/12/26 04:28:16 rumble Exp $ */ +/* $Id: lightvar.h,v 1.2 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble @@ -27,7 +27,7 @@ #ifndef _ARCH_SGIMIPS_GIO_LIGHTVAR_H_ #define _ARCH_SGIMIPS_GIO_LIGHTVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> int light_cnattach(struct gio_attach_args *); Index: src/sys/arch/sgimips/gio/pci_gio.c diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.8 src/sys/arch/sgimips/gio/pci_gio.c:1.9 --- src/sys/arch/sgimips/gio/pci_gio.c:1.8 Tue May 17 17:34:52 2011 +++ src/sys/arch/sgimips/gio/pci_gio.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_gio.c,v 1.8 2011/05/17 17:34:52 dyoung Exp $ */ +/* $NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.8 2011/05/17 17:34:52 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $"); /* * Glue for PCI devices that are connected to the GIO bus by various little @@ -45,7 +45,7 @@ #include <sys/malloc.h> #include <sys/extent.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <sgimips/gio/giovar.h> Index: src/sys/arch/sgimips/hpc/haltwo.c diff -u src/sys/arch/sgimips/hpc/haltwo.c:1.19 src/sys/arch/sgimips/hpc/haltwo.c:1.20 --- src/sys/arch/sgimips/hpc/haltwo.c:1.19 Tue Jan 25 13:31:41 2011 +++ src/sys/arch/sgimips/hpc/haltwo.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: haltwo.c,v 1.19 2011/01/25 13:31:41 tsutsui Exp $ */ +/* $NetBSD: haltwo.c,v 1.20 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.19 2011/01/25 13:31:41 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.20 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,7 +43,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/sysconf.h> #include <sgimips/hpc/hpcvar.h> Index: src/sys/arch/sgimips/hpc/hpc.c diff -u src/sys/arch/sgimips/hpc/hpc.c:1.65 src/sys/arch/sgimips/hpc/hpc.c:1.66 --- src/sys/arch/sgimips/hpc/hpc.c:1.65 Tue Jan 25 13:22:05 2011 +++ src/sys/arch/sgimips/hpc/hpc.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $ */ +/* $NetBSD: hpc.c,v 1.66 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.65 2011/01/25 13:22:05 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.66 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,7 +45,7 @@ #include <sys/callout.h> #define _SGIMIPS_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/hpc/hpcdma.c diff -u src/sys/arch/sgimips/hpc/hpcdma.c:1.20 src/sys/arch/sgimips/hpc/hpcdma.c:1.21 --- src/sys/arch/sgimips/hpc/hpcdma.c:1.20 Tue Jan 25 12:30:32 2011 +++ src/sys/arch/sgimips/hpc/hpcdma.c Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hpcdma.c,v 1.20 2011/01/25 12:30:32 tsutsui Exp $ */ +/* $NetBSD: hpcdma.c,v 1.21 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2001 Wayne Knowles @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.20 2011/01/25 12:30:32 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.21 2011/07/01 18:53:46 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,7 +53,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <sgimips/hpc/hpcvar.h> #include <sgimips/hpc/hpcreg.h> Index: src/sys/arch/sgimips/hpc/hpcdma.h diff -u src/sys/arch/sgimips/hpc/hpcdma.h:1.10 src/sys/arch/sgimips/hpc/hpcdma.h:1.11 --- src/sys/arch/sgimips/hpc/hpcdma.h:1.10 Tue Jan 25 12:21:04 2011 +++ src/sys/arch/sgimips/hpc/hpcdma.h Fri Jul 1 18:53:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hpcdma.h,v 1.10 2011/01/25 12:21:04 tsutsui Exp $ */ +/* $NetBSD: hpcdma.h,v 1.11 2011/07/01 18:53:46 dyoung Exp $ */ /* * Copyright (c) 2001 Wayne Knowles @@ -39,7 +39,7 @@ #ifndef _SGIMIPS_HPC_DMA_H #define _SGIMIPS_HPC_DMA_H -#include <machine/bus.h> +#include <sys/bus.h> struct hpc_dma_softc { bus_space_tag_t sc_bst; Index: src/sys/arch/sgimips/hpc/pi1ppc.c diff -u src/sys/arch/sgimips/hpc/pi1ppc.c:1.10 src/sys/arch/sgimips/hpc/pi1ppc.c:1.11 --- src/sys/arch/sgimips/hpc/pi1ppc.c:1.10 Thu Jun 9 02:49:32 2011 +++ src/sys/arch/sgimips/hpc/pi1ppc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pi1ppc.c,v 1.10 2011/06/09 02:49:32 rmind Exp $ */ +/* $NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2001 Alcove - Nicolas Souchu @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.10 2011/06/09 02:49:32 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $"); #include "opt_pi1ppc.h" @@ -44,7 +44,7 @@ #include <sys/device.h> #include <sys/systm.h> -#include <machine/bus.h> +#include <sys/bus.h> /*#include <machine/intr.h>*/ #include <dev/ppbus/ppbus_conf.h> Index: src/sys/arch/sgimips/hpc/if_sq.c diff -u src/sys/arch/sgimips/hpc/if_sq.c:1.41 src/sys/arch/sgimips/hpc/if_sq.c:1.42 --- src/sys/arch/sgimips/hpc/if_sq.c:1.41 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/hpc/if_sq.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sq.c,v 1.41 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.41 2011/02/20 07:59:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> @@ -59,7 +59,7 @@ #include <net/bpf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/hpc/pi1ppcvar.h diff -u src/sys/arch/sgimips/hpc/pi1ppcvar.h:1.5 src/sys/arch/sgimips/hpc/pi1ppcvar.h:1.6 --- src/sys/arch/sgimips/hpc/pi1ppcvar.h:1.5 Thu Jun 9 02:49:32 2011 +++ src/sys/arch/sgimips/hpc/pi1ppcvar.h Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pi1ppcvar.h,v 1.5 2011/06/09 02:49:32 rmind Exp $ */ +/* $NetBSD: pi1ppcvar.h,v 1.6 2011/07/01 18:53:47 dyoung Exp $ */ /*- * Copyright (c) 2001 Alcove - Nicolas Souchu @@ -33,7 +33,7 @@ #ifndef __PI1PPCVAR_H #define __PI1PPCVAR_H -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/types.h> #include <sys/device.h> #include <sys/callout.h> Index: src/sys/arch/sgimips/hpc/wdsc.c diff -u src/sys/arch/sgimips/hpc/wdsc.c:1.31 src/sys/arch/sgimips/hpc/wdsc.c:1.32 --- src/sys/arch/sgimips/hpc/wdsc.c:1.31 Tue Jan 25 12:30:32 2011 +++ src/sys/arch/sgimips/hpc/wdsc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wdsc.c,v 1.31 2011/01/25 12:30:32 tsutsui Exp $ */ +/* $NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2001 Wayne Knowles @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.31 2011/01/25 12:30:32 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ #include <dev/scsipi/scsiconf.h> #include <machine/cpu.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/ioc/ioc.c diff -u src/sys/arch/sgimips/ioc/ioc.c:1.8 src/sys/arch/sgimips/ioc/ioc.c:1.9 --- src/sys/arch/sgimips/ioc/ioc.c:1.8 Tue Mar 3 19:45:55 2009 +++ src/sys/arch/sgimips/ioc/ioc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ioc.c,v 1.8 2009/03/03 19:45:55 macallan Exp $ */ +/* $NetBSD: ioc.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2003 Christopher Sekiya @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.8 2009/03/03 19:45:55 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +52,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> Index: src/sys/arch/sgimips/ioc/oioc.c diff -u src/sys/arch/sgimips/ioc/oioc.c:1.1 src/sys/arch/sgimips/ioc/oioc.c:1.2 --- src/sys/arch/sgimips/ioc/oioc.c:1.1 Tue Feb 10 06:04:56 2009 +++ src/sys/arch/sgimips/ioc/oioc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: oioc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ +/* $NetBSD: oioc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -46,7 +46,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/ioc/oiocsc.c diff -u src/sys/arch/sgimips/ioc/oiocsc.c:1.1 src/sys/arch/sgimips/ioc/oiocsc.c:1.2 --- src/sys/arch/sgimips/ioc/oiocsc.c:1.1 Tue Feb 10 06:04:56 2009 +++ src/sys/arch/sgimips/ioc/oiocsc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: oiocsc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ +/* $NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.1 2009/02/10 06:04:56 rumble Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ #include <dev/scsipi/scsiconf.h> #include <machine/cpu.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <machine/machtype.h> #include <machine/sysconf.h> Index: src/sys/arch/sgimips/ioc/oiocvar.h diff -u src/sys/arch/sgimips/ioc/oiocvar.h:1.1 src/sys/arch/sgimips/ioc/oiocvar.h:1.2 --- src/sys/arch/sgimips/ioc/oiocvar.h:1.1 Tue Feb 10 06:04:56 2009 +++ src/sys/arch/sgimips/ioc/oiocvar.h Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: oiocvar.h,v 1.1 2009/02/10 06:04:56 rumble Exp $ */ +/* $NetBSD: oiocvar.h,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -40,7 +40,7 @@ #ifndef _ARCH_SGIMIPS_DEV_OIOCVAR_H_ #define _ARCH_SGIMIPS_DEV_OIOCVAR_H_ -#include <machine/bus.h> +#include <sys/bus.h> struct oioc_attach_args { const char *oa_name; /* name of device */ Index: src/sys/arch/sgimips/mace/com_mace.c diff -u src/sys/arch/sgimips/mace/com_mace.c:1.8 src/sys/arch/sgimips/mace/com_mace.c:1.9 --- src/sys/arch/sgimips/mace/com_mace.c:1.8 Sat Nov 21 17:40:28 2009 +++ src/sys/arch/sgimips/mace/com_mace.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $ */ +/* $NetBSD: com_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <sgimips/mace/macevar.h> Index: src/sys/arch/sgimips/mace/lpt_mace.c diff -u src/sys/arch/sgimips/mace/lpt_mace.c:1.8 src/sys/arch/sgimips/mace/lpt_mace.c:1.9 --- src/sys/arch/sgimips/mace/lpt_mace.c:1.8 Sat Nov 21 17:40:28 2009 +++ src/sys/arch/sgimips/mace/lpt_mace.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $ */ +/* $NetBSD: lpt_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2003 Christopher SEKIYA @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_mace.c,v 1.8 2009/11/21 17:40:28 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_mace.c,v 1.9 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +52,7 @@ #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <sgimips/mace/macevar.h> Index: src/sys/arch/sgimips/mace/if_mec.c diff -u src/sys/arch/sgimips/mace/if_mec.c:1.45 src/sys/arch/sgimips/mace/if_mec.c:1.46 --- src/sys/arch/sgimips/mace/if_mec.c:1.45 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/mace/if_mec.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mec.c,v 1.45 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: if_mec.c,v 1.46 2011/07/01 18:53:47 dyoung Exp $ */ /*- * Copyright (c) 2004, 2008 Izumi Tsutsui. All rights reserved. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.45 2011/02/20 07:59:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.46 2011/07/01 18:53:47 dyoung Exp $"); #include "opt_ddb.h" #include "rnd.h" @@ -94,7 +94,7 @@ #include <net/bpf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/machtype.h> Index: src/sys/arch/sgimips/mace/mace.c diff -u src/sys/arch/sgimips/mace/mace.c:1.16 src/sys/arch/sgimips/mace/mace.c:1.17 --- src/sys/arch/sgimips/mace/mace.c:1.16 Mon Dec 14 00:46:13 2009 +++ src/sys/arch/sgimips/mace/mace.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mace.c,v 1.16 2009/12/14 00:46:13 matt Exp $ */ +/* $NetBSD: mace.c,v 1.17 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2003 Christopher Sekiya @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.16 2009/12/14 00:46:13 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.17 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,7 +62,7 @@ #include <uvm/uvm_extern.h> #define _SGIMIPS_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/locore.h> #include <machine/autoconf.h> Index: src/sys/arch/sgimips/mace/macekbc.c diff -u src/sys/arch/sgimips/mace/macekbc.c:1.5 src/sys/arch/sgimips/mace/macekbc.c:1.6 --- src/sys/arch/sgimips/mace/macekbc.c:1.5 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/mace/macekbc.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: macekbc.c,v 1.5 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: macekbc.c,v 1.6 2011/07/01 18:53:47 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,14 +31,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: macekbc.c,v 1.5 2011/02/20 07:59:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: macekbc.c,v 1.6 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> #include <sys/syslog.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <sgimips/mace/macevar.h> Index: src/sys/arch/sgimips/mace/mavb.c diff -u src/sys/arch/sgimips/mace/mavb.c:1.6 src/sys/arch/sgimips/mace/mavb.c:1.7 --- src/sys/arch/sgimips/mace/mavb.c:1.6 Sat Aug 23 17:43:36 2008 +++ src/sys/arch/sgimips/mace/mavb.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mavb.c,v 1.6 2008/08/23 17:43:36 tsutsui Exp $ */ +/* $NetBSD: mavb.c,v 1.7 2011/07/01 18:53:47 dyoung Exp $ */ /* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */ /* @@ -24,7 +24,7 @@ #include <sys/malloc.h> #include <sys/callout.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/autoconf.h> Index: src/sys/arch/sgimips/mace/mcclock_mace.c diff -u src/sys/arch/sgimips/mace/mcclock_mace.c:1.13 src/sys/arch/sgimips/mace/mcclock_mace.c:1.14 --- src/sys/arch/sgimips/mace/mcclock_mace.c:1.13 Sun Dec 13 11:10:50 2009 +++ src/sys/arch/sgimips/mace/mcclock_mace.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_mace.c,v 1.13 2009/12/13 11:10:50 tsutsui Exp $ */ +/* $NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2001 Antti Kantee. All Rights Reserved. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.13 2009/12/13 11:10:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock_mace.c,v 1.14 2011/07/01 18:53:47 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,7 +73,7 @@ #include <machine/cpu.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <dev/clock_subr.h> Index: src/sys/arch/sgimips/mace/pci_mace.c diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.12 src/sys/arch/sgimips/mace/pci_mace.c:1.13 --- src/sys/arch/sgimips/mace/pci_mace.c:1.12 Tue May 17 17:34:52 2011 +++ src/sys/arch/sgimips/mace/pci_mace.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_mace.c,v 1.12 2011/05/17 17:34:52 dyoung Exp $ */ +/* $NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2001,2003 Christopher Sekiya @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.12 2011/05/17 17:34:52 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.13 2011/07/01 18:53:47 dyoung Exp $"); #include "opt_pci.h" #include "pci.h" @@ -47,7 +47,7 @@ #include <machine/locore.h> #include <machine/autoconf.h> #include <machine/vmparam.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <mips/cache.h> Index: src/sys/arch/sgimips/pci/pci_machdep.c diff -u src/sys/arch/sgimips/pci/pci_machdep.c:1.21 src/sys/arch/sgimips/pci/pci_machdep.c:1.22 --- src/sys/arch/sgimips/pci/pci_machdep.c:1.21 Wed May 11 17:49:31 2011 +++ src/sys/arch/sgimips/pci/pci_machdep.c Fri Jul 1 18:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.22 2011/07/01 18:53:47 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.22 2011/07/01 18:53:47 dyoung Exp $"); #include "opt_pci.h" #include "pci.h" @@ -48,7 +48,7 @@ #include <uvm/uvm_extern.h> #define _SGIMIPS_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/sysconf.h>