Module Name: src Committed By: dyoung Date: Fri Jul 1 18:54:33 UTC 2011
Modified Files: src/sys/arch/sgimips/sgimips: arcemu.c console.c machdep.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/sgimips/arcemu.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sgimips/sgimips/console.c cvs rdiff -u -r1.134 -r1.135 src/sys/arch/sgimips/sgimips/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/sgimips/arcemu.c diff -u src/sys/arch/sgimips/sgimips/arcemu.c:1.20 src/sys/arch/sgimips/sgimips/arcemu.c:1.21 --- src/sys/arch/sgimips/sgimips/arcemu.c:1.20 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/arcemu.c Fri Jul 1 18:54:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: arcemu.c,v 1.20 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $ */ /* * Copyright (c) 2004 Steve Rumble @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arcemu.c,v 1.20 2011/02/20 07:59:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $"); #ifndef _LP64 @@ -37,7 +37,7 @@ #include <sys/systm.h> #include <machine/machtype.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/cons.h> Index: src/sys/arch/sgimips/sgimips/console.c diff -u src/sys/arch/sgimips/sgimips/console.c:1.41 src/sys/arch/sgimips/sgimips/console.c:1.42 --- src/sys/arch/sgimips/sgimips/console.c:1.41 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/console.c Fri Jul 1 18:54:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: console.c,v 1.41 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.41 2011/02/20 07:59:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.42 2011/07/01 18:54:32 dyoung Exp $"); #include "opt_kgdb.h" @@ -37,7 +37,7 @@ #include <sys/termios.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/machtype.h> #include <dev/cons.h> Index: src/sys/arch/sgimips/sgimips/machdep.c diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.134 src/sys/arch/sgimips/sgimips/machdep.c:1.135 --- src/sys/arch/sgimips/sgimips/machdep.c:1.134 Sun Feb 20 07:59:51 2011 +++ src/sys/arch/sgimips/sgimips/machdep.c Fri Jul 1 18:54:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.134 2011/02/20 07:59:51 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.135 2011/07/01 18:54:33 dyoung Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.134 2011/02/20 07:59:51 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.135 2011/07/01 18:54:33 dyoung Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -75,7 +75,7 @@ #include <machine/sysconf.h> #include <machine/intr.h> #include <machine/bootinfo.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <mips/locore.h> #include <mips/cache.h>