Module Name: src Committed By: dyoung Date: Fri Jul 1 19:02:32 UTC 2011
Modified Files: src/sys/arch/evbppc/explora: consinit.c src/sys/arch/evbppc/explora/dev: com_elb.c elb.c fb_elb.c le_elb.c lpt_elb.c pckbc_elb.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/explora/consinit.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/dev/com_elb.c \ src/sys/arch/evbppc/explora/dev/elb.c \ src/sys/arch/evbppc/explora/dev/le_elb.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/explora/dev/fb_elb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/dev/lpt_elb.c \ src/sys/arch/evbppc/explora/dev/pckbc_elb.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/evbppc/explora/consinit.c diff -u src/sys/arch/evbppc/explora/consinit.c:1.7 src/sys/arch/evbppc/explora/consinit.c:1.8 --- src/sys/arch/evbppc/explora/consinit.c:1.7 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/consinit.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.7 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,13 +30,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2008/04/28 20:23:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <machine/explora.h> -#include <machine/bus.h> +#include <sys/bus.h> #include "com.h" #if NCOM > 0 Index: src/sys/arch/evbppc/explora/dev/com_elb.c diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.8 src/sys/arch/evbppc/explora/dev/com_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/com_elb.c:1.8 Fri Aug 8 09:50:19 2008 +++ src/sys/arch/evbppc/explora/dev/com_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_elb.c,v 1.8 2008/08/08 09:50:19 hannken Exp $ */ +/* $NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.8 2008/08/08 09:50:19 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -38,7 +38,7 @@ #include <sys/systm.h> #include <sys/tty.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> Index: src/sys/arch/evbppc/explora/dev/elb.c diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.8 src/sys/arch/evbppc/explora/dev/elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/elb.c:1.8 Mon Jun 6 17:13:06 2011 +++ src/sys/arch/evbppc/explora/dev/elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $ */ +/* $NetBSD: elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -40,7 +40,7 @@ #include <machine/explora.h> #define _POWERPC_BUS_DMA_PRIVATE -#include <machine/bus.h> +#include <sys/bus.h> #include <powerpc/ibm4xx/dcr403cgx.h> Index: src/sys/arch/evbppc/explora/dev/le_elb.c diff -u src/sys/arch/evbppc/explora/dev/le_elb.c:1.8 src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/le_elb.c:1.8 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/dev/le_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: le_elb.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.8 2008/04/28 20:23:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -39,7 +39,7 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <net/if.h> #include <net/if_ether.h> Index: src/sys/arch/evbppc/explora/dev/fb_elb.c diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.12 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 --- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.12 Sat Jun 18 06:44:25 2011 +++ src/sys/arch/evbppc/explora/dev/fb_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_elb.c,v 1.12 2011/06/18 06:44:25 matt Exp $ */ +/* $NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.12 2011/06/18 06:44:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -44,7 +44,7 @@ #include <dev/rasops/rasops.h> #include <machine/explora.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <evbppc/explora/dev/elbvar.h> Index: src/sys/arch/evbppc/explora/dev/lpt_elb.c diff -u src/sys/arch/evbppc/explora/dev/lpt_elb.c:1.6 src/sys/arch/evbppc/explora/dev/lpt_elb.c:1.7 --- src/sys/arch/evbppc/explora/dev/lpt_elb.c:1.6 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/dev/lpt_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: lpt_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -38,7 +38,7 @@ #include <sys/systm.h> #include <sys/tty.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.6 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.7 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.6 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Fri Jul 1 19:02:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -38,7 +38,7 @@ #include <sys/systm.h> #include <sys/malloc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/i8042reg.h> #include <dev/ic/pckbcvar.h>