Module Name: src Committed By: dyoung Date: Fri Jul 1 18:59:20 UTC 2011
Modified Files: src/sys/arch/powerpc/isa: isadma_machdep.c isapnp_machdep.c src/sys/arch/powerpc/oea: ofw_autoconf.c ofw_consinit.c ofw_rascons.c prep_machdep.c src/sys/arch/powerpc/pci: pchb.c pcib.c src/sys/arch/powerpc/powerpc: pio_subr.S Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/isa/isadma_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/isa/isapnp_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/oea/ofw_autoconf.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/ofw_consinit.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/oea/ofw_rascons.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/oea/prep_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pci/pchb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pci/pcib.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/powerpc/pio_subr.S 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/powerpc/isa/isadma_machdep.c diff -u src/sys/arch/powerpc/isa/isadma_machdep.c:1.6 src/sys/arch/powerpc/isa/isadma_machdep.c:1.7 --- src/sys/arch/powerpc/isa/isadma_machdep.c:1.6 Wed Nov 10 09:27:23 2010 +++ src/sys/arch/powerpc/isa/isadma_machdep.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isadma_machdep.c,v 1.6 2010/11/10 09:27:23 uebayasi Exp $ */ +/* $NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.6 2010/11/10 09:27:23 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $"); #define ISA_DMA_STATS @@ -44,7 +44,7 @@ #include <sys/mbuf.h> #define _POWERPC_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pio.h> Index: src/sys/arch/powerpc/isa/isapnp_machdep.c diff -u src/sys/arch/powerpc/isa/isapnp_machdep.c:1.4 src/sys/arch/powerpc/isa/isapnp_machdep.c:1.5 --- src/sys/arch/powerpc/isa/isapnp_machdep.c:1.4 Wed Oct 21 21:57:40 2009 +++ src/sys/arch/powerpc/isa/isapnp_machdep.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $ */ +/* $NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -73,14 +73,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/isa/isavar.h> Index: src/sys/arch/powerpc/oea/ofw_autoconf.c diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.13 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.14 --- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.13 Fri Jun 17 19:03:04 2011 +++ src/sys/arch/powerpc/oea/ofw_autoconf.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_autoconf.c,v 1.13 2011/06/17 19:03:04 matt Exp $ */ +/* $NetBSD: ofw_autoconf.c,v 1.14 2011/07/01 18:59:19 dyoung Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.13 2011/06/17 19:03:04 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.14 2011/07/01 18:59:19 dyoung Exp $"); #ifdef ofppc #include "gtpci.h" @@ -46,7 +46,7 @@ #include <uvm/uvm_extern.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/stdarg.h> #include <dev/ofw/openfirm.h> Index: src/sys/arch/powerpc/oea/ofw_consinit.c diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.11 src/sys/arch/powerpc/oea/ofw_consinit.c:1.12 --- src/sys/arch/powerpc/oea/ofw_consinit.c:1.11 Sun Nov 14 03:32:44 2010 +++ src/sys/arch/powerpc/oea/ofw_consinit.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_consinit.c,v 1.11 2010/11/14 03:32:44 uebayasi Exp $ */ +/* $NetBSD: ofw_consinit.c,v 1.12 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.11 2010/11/14 03:32:44 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.12 2011/07/01 18:59:19 dyoung Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -40,7 +40,7 @@ #include <machine/autoconf.h> #include <machine/trap.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <powerpc/ofw_cons.h> Index: src/sys/arch/powerpc/oea/ofw_rascons.c diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.5 src/sys/arch/powerpc/oea/ofw_rascons.c:1.6 --- src/sys/arch/powerpc/oea/ofw_rascons.c:1.5 Thu May 6 04:32:16 2010 +++ src/sys/arch/powerpc/oea/ofw_rascons.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_rascons.c,v 1.5 2010/05/06 04:32:16 macallan Exp $ */ +/* $NetBSD: ofw_rascons.c,v 1.6 2011/07/01 18:59:19 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.5 2010/05/06 04:32:16 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.6 2011/07/01 18:59:19 dyoung Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -43,7 +43,7 @@ #include <dev/ofw/openfirm.h> #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/autoconf.h> #include <dev/wscons/wsconsio.h> Index: src/sys/arch/powerpc/oea/prep_machdep.c diff -u src/sys/arch/powerpc/oea/prep_machdep.c:1.6 src/sys/arch/powerpc/oea/prep_machdep.c:1.7 --- src/sys/arch/powerpc/oea/prep_machdep.c:1.6 Fri Feb 13 22:41:03 2009 +++ src/sys/arch/powerpc/oea/prep_machdep.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: prep_machdep.c,v 1.6 2009/02/13 22:41:03 apb Exp $ */ +/* $NetBSD: prep_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.6 2009/02/13 22:41:03 apb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $"); #include "opt_modular.h" @@ -50,7 +50,7 @@ #include <uvm/uvm_extern.h> #include <machine/powerpc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pmap.h> #include <powerpc/oea/bat.h> Index: src/sys/arch/powerpc/pci/pchb.c diff -u src/sys/arch/powerpc/pci/pchb.c:1.7 src/sys/arch/powerpc/pci/pchb.c:1.8 --- src/sys/arch/powerpc/pci/pchb.c:1.7 Thu Jun 30 00:52:59 2011 +++ src/sys/arch/powerpc/pci/pchb.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pchb.c,v 1.7 2011/06/30 00:52:59 matt Exp $ */ +/* $NetBSD: pchb.c,v 1.8 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.7 2011/06/30 00:52:59 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2011/07/01 18:59:19 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/pio.h> #include <dev/pci/pcivar.h> Index: src/sys/arch/powerpc/pci/pcib.c diff -u src/sys/arch/powerpc/pci/pcib.c:1.6 src/sys/arch/powerpc/pci/pcib.c:1.7 --- src/sys/arch/powerpc/pci/pcib.c:1.6 Fri Jun 17 19:03:01 2011 +++ src/sys/arch/powerpc/pci/pcib.c Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.6 2011/06/17 19:03:01 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.6 2011/06/17 19:03:01 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/isa/isavar.h> Index: src/sys/arch/powerpc/powerpc/pio_subr.S diff -u src/sys/arch/powerpc/powerpc/pio_subr.S:1.13 src/sys/arch/powerpc/powerpc/pio_subr.S:1.14 --- src/sys/arch/powerpc/powerpc/pio_subr.S:1.13 Tue Jan 18 01:02:55 2011 +++ src/sys/arch/powerpc/powerpc/pio_subr.S Fri Jul 1 18:59:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pio_subr.S,v 1.13 2011/01/18 01:02:55 matt Exp $ */ +/* $NetBSD: pio_subr.S,v 1.14 2011/07/01 18:59:19 dyoung Exp $ */ /* * Copyright (c) 2003 Matt Thomas @@ -46,7 +46,7 @@ /* LINTSTUB: include <sys/param.h> */ /* LINTSTUB: include <sys/types.h> */ -/* LINTSTUB: include <machine/bus.h> */ +/* LINTSTUB: include <sys/bus.h> */ /* LINTSTUB: Func: void out8(volatile u_int8_t *a, u_int8_t v) */