Module Name: src Committed By: dyoung Date: Fri Jul 1 18:33:10 UTC 2011
Modified Files: src/sys/arch/hp700/dev: asp.c com_dino.c com_ssio.c gecko.c lasi.c lcd.c lpt_ssio.c mongoose.c siop_sgc.c ssio.c sti_sgc.c uturn.c src/sys/arch/hp700/gsc: com_gsc.c fdc_gsc.c gsckbc.c harmony.c if_ie_gsc.c if_iee_gsc.c lpt_gsc.c oosiop_gsc.c osiop_gsc.c siop_gsc.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/dev/asp.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp700/dev/com_dino.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp700/dev/com_ssio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/dev/gecko.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp700/dev/lasi.c \ src/sys/arch/hp700/dev/sti_sgc.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp700/dev/lcd.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/dev/lpt_ssio.c \ src/sys/arch/hp700/dev/ssio.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp700/dev/mongoose.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/dev/siop_sgc.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/dev/uturn.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp700/gsc/com_gsc.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/gsc/fdc_gsc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/gsc/gsckbc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp700/gsc/harmony.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/gsc/if_ie_gsc.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/gsc/if_iee_gsc.c \ src/sys/arch/hp700/gsc/osiop_gsc.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/gsc/lpt_gsc.c \ src/sys/arch/hp700/gsc/siop_gsc.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/gsc/oosiop_gsc.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/hp700/dev/asp.c diff -u src/sys/arch/hp700/dev/asp.c:1.18 src/sys/arch/hp700/dev/asp.c:1.19 --- src/sys/arch/hp700/dev/asp.c:1.18 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/asp.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */ @@ -37,14 +37,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/reboot.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <machine/autoconf.h> #include <machine/cpufunc.h> Index: src/sys/arch/hp700/dev/com_dino.c diff -u src/sys/arch/hp700/dev/com_dino.c:1.8 src/sys/arch/hp700/dev/com_dino.c:1.9 --- src/sys/arch/hp700/dev/com_dino.c:1.8 Mon May 18 05:13:26 2009 +++ src/sys/arch/hp700/dev/com_dino.c Fri Jul 1 18:33:09 2011 @@ -31,7 +31,7 @@ #include <sys/device.h> #include <sys/tty.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/dev/com_ssio.c diff -u src/sys/arch/hp700/dev/com_ssio.c:1.2 src/sys/arch/hp700/dev/com_ssio.c:1.3 --- src/sys/arch/hp700/dev/com_ssio.c:1.2 Fri Mar 5 18:41:29 2010 +++ src/sys/arch/hp700/dev/com_ssio.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_ssio.c,v 1.2 2010/03/05 18:41:29 skrll Exp $ */ +/* $NetBSD: com_ssio.c,v 1.3 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $ */ @@ -23,7 +23,7 @@ #include <sys/device.h> #include <sys/tty.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <dev/ic/comreg.h> Index: src/sys/arch/hp700/dev/gecko.c diff -u src/sys/arch/hp700/dev/gecko.c:1.3 src/sys/arch/hp700/dev/gecko.c:1.4 --- src/sys/arch/hp700/dev/gecko.c:1.3 Thu Jan 13 21:15:13 2011 +++ src/sys/arch/hp700/dev/gecko.c Fri Jul 1 18:33:09 2011 @@ -22,7 +22,7 @@ #include <sys/systm.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/iomod.h> #include <machine/pdc.h> Index: src/sys/arch/hp700/dev/lasi.c diff -u src/sys/arch/hp700/dev/lasi.c:1.20 src/sys/arch/hp700/dev/lasi.c:1.21 --- src/sys/arch/hp700/dev/lasi.c:1.20 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/lasi.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $"); #undef LASIDEBUG @@ -38,7 +38,7 @@ #include <sys/device.h> #include <sys/reboot.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/dev/sti_sgc.c diff -u src/sys/arch/hp700/dev/sti_sgc.c:1.20 src/sys/arch/hp700/dev/sti_sgc.c:1.21 --- src/sys/arch/hp700/dev/sti_sgc.c:1.20 Tue Nov 9 12:24:47 2010 +++ src/sys/arch/hp700/dev/sti_sgc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sti_sgc.c,v 1.20 2010/11/09 12:24:47 skrll Exp $ */ +/* $NetBSD: sti_sgc.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.20 2010/11/09 12:24:47 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $"); #include "opt_cputype.h" @@ -45,7 +45,7 @@ #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/dev/lcd.c diff -u src/sys/arch/hp700/dev/lcd.c:1.4 src/sys/arch/hp700/dev/lcd.c:1.5 --- src/sys/arch/hp700/dev/lcd.c:1.4 Tue Jan 4 10:42:33 2011 +++ src/sys/arch/hp700/dev/lcd.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lcd.c,v 1.4 2011/01/04 10:42:33 skrll Exp $ */ +/* $NetBSD: lcd.c,v 1.5 2011/07/01 18:33:09 dyoung Exp $ */ /* OpenBSD: lcd.c,v 1.2 2007/07/20 22:13:45 kettenis Exp */ /* @@ -24,7 +24,7 @@ #include <sys/callout.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/cpu.h> #include <machine/pdc.h> Index: src/sys/arch/hp700/dev/lpt_ssio.c diff -u src/sys/arch/hp700/dev/lpt_ssio.c:1.1 src/sys/arch/hp700/dev/lpt_ssio.c:1.2 --- src/sys/arch/hp700/dev/lpt_ssio.c:1.1 Thu May 28 08:41:29 2009 +++ src/sys/arch/hp700/dev/lpt_ssio.c Fri Jul 1 18:33:09 2011 @@ -20,7 +20,7 @@ #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> Index: src/sys/arch/hp700/dev/ssio.c diff -u src/sys/arch/hp700/dev/ssio.c:1.1 src/sys/arch/hp700/dev/ssio.c:1.2 --- src/sys/arch/hp700/dev/ssio.c:1.1 Thu May 28 08:41:29 2009 +++ src/sys/arch/hp700/dev/ssio.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ssio.c,v 1.1 2009/05/28 08:41:29 skrll Exp $ */ +/* $NetBSD: ssio.c,v 1.2 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: ssio.c,v 1.7 2009/03/08 22:19:04 miod Exp $ */ @@ -26,7 +26,7 @@ #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <dev/pci/pcireg.h> Index: src/sys/arch/hp700/dev/mongoose.c diff -u src/sys/arch/hp700/dev/mongoose.c:1.21 src/sys/arch/hp700/dev/mongoose.c:1.22 --- src/sys/arch/hp700/dev/mongoose.c:1.21 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/mongoose.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $"); #define MONGOOSE_DEBUG 9 @@ -38,7 +38,7 @@ #include <sys/device.h> #include <sys/reboot.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/dev/siop_sgc.c diff -u src/sys/arch/hp700/dev/siop_sgc.c:1.7 src/sys/arch/hp700/dev/siop_sgc.c:1.8 --- src/sys/arch/hp700/dev/siop_sgc.c:1.7 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/dev/siop_sgc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $ */ @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -28,7 +28,7 @@ #include <uvm/uvm_extern.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <dev/scsipi/scsi_all.h> Index: src/sys/arch/hp700/dev/uturn.c diff -u src/sys/arch/hp700/dev/uturn.c:1.15 src/sys/arch/hp700/dev/uturn.c:1.16 --- src/sys/arch/hp700/dev/uturn.c:1.15 Thu Jan 13 21:44:13 2011 +++ src/sys/arch/hp700/dev/uturn.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: uturn.c,v 1.15 2011/01/13 21:44:13 skrll Exp $ */ +/* $NetBSD: uturn.c,v 1.16 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */ @@ -40,7 +40,7 @@ #include <uvm/uvm.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/gsc/com_gsc.c diff -u src/sys/arch/hp700/gsc/com_gsc.c:1.16 src/sys/arch/hp700/gsc/com_gsc.c:1.17 --- src/sys/arch/hp700/gsc/com_gsc.c:1.16 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/com_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_gsc.c,v 1.16 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.16 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $"); #include "opt_kgdb.h" @@ -42,7 +42,7 @@ #include <sys/kgdb.h> #endif -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/gsc/fdc_gsc.c diff -u src/sys/arch/hp700/gsc/fdc_gsc.c:1.9 src/sys/arch/hp700/gsc/fdc_gsc.c:1.10 --- src/sys/arch/hp700/gsc/fdc_gsc.c:1.9 Sat Dec 11 19:32:06 2010 +++ src/sys/arch/hp700/gsc/fdc_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_gsc.c,v 1.9 2010/12/11 19:32:06 skrll Exp $ */ +/* $NetBSD: fdc_gsc.c,v 1.10 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: fdc_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $ */ @@ -29,14 +29,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.9 2010/12/11 19:32:06 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.10 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <machine/iomod.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/gsc/gsckbc.c diff -u src/sys/arch/hp700/gsc/gsckbc.c:1.7 src/sys/arch/hp700/gsc/gsckbc.c:1.8 --- src/sys/arch/hp700/gsc/gsckbc.c:1.7 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/gsckbc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gsckbc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $ */ /* * Copyright (c) 2004 Jochen Kunz. * All rights reserved. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include "ioconf.h" /* bus_space / bus_dma etc. */ -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> /* general system data and functions */ Index: src/sys/arch/hp700/gsc/harmony.c diff -u src/sys/arch/hp700/gsc/harmony.c:1.22 src/sys/arch/hp700/gsc/harmony.c:1.23 --- src/sys/arch/hp700/gsc/harmony.c:1.22 Fri Feb 4 11:00:30 2011 +++ src/sys/arch/hp700/gsc/harmony.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.22 2011/02/04 11:00:30 skrll Exp $ */ +/* $NetBSD: harmony.c,v 1.23 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -85,7 +85,7 @@ #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <hp700/dev/cpudevs.h> #include <hp700/gsc/gscbusvar.h> Index: src/sys/arch/hp700/gsc/if_ie_gsc.c diff -u src/sys/arch/hp700/gsc/if_ie_gsc.c:1.24 src/sys/arch/hp700/gsc/if_ie_gsc.c:1.25 --- src/sys/arch/hp700/gsc/if_ie_gsc.c:1.24 Fri Jun 3 16:28:40 2011 +++ src/sys/arch/hp700/gsc/if_ie_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_gsc.c,v 1.24 2011/06/03 16:28:40 tsutsui Exp $ */ +/* $NetBSD: if_ie_gsc.c,v 1.25 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: if_ie_gsc.c,v 1.6 2001/01/12 22:57:04 mickey Exp $ */ @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.24 2011/06/03 16:28:40 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.25 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,7 +56,7 @@ #include <netinet/in.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/gsc/if_iee_gsc.c diff -u src/sys/arch/hp700/gsc/if_iee_gsc.c:1.19 src/sys/arch/hp700/gsc/if_iee_gsc.c:1.20 --- src/sys/arch/hp700/gsc/if_iee_gsc.c:1.19 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/if_iee_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iee_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ */ /* * Copyright (c) 2003 Jochen Kunz. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $"); /* autoconfig and device stuff */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include "ioconf.h" /* bus_space / bus_dma etc. */ -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> /* general system data and functions */ Index: src/sys/arch/hp700/gsc/osiop_gsc.c diff -u src/sys/arch/hp700/gsc/osiop_gsc.c:1.19 src/sys/arch/hp700/gsc/osiop_gsc.c:1.20 --- src/sys/arch/hp700/gsc/osiop_gsc.c:1.19 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/osiop_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: osiop_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ */ /* * Copyright (c) 2001 Matt Fredette. All rights reserved. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,7 +96,7 @@ #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/osiopreg.h> #include <dev/ic/osiopvar.h> Index: src/sys/arch/hp700/gsc/lpt_gsc.c diff -u src/sys/arch/hp700/gsc/lpt_gsc.c:1.13 src/sys/arch/hp700/gsc/lpt_gsc.c:1.14 --- src/sys/arch/hp700/gsc/lpt_gsc.c:1.13 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/lpt_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: lpt_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: lpt_gsc.c,v 1.6 2000/07/21 17:41:06 mickey Exp $ */ @@ -53,13 +53,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> Index: src/sys/arch/hp700/gsc/siop_gsc.c diff -u src/sys/arch/hp700/gsc/siop_gsc.c:1.13 src/sys/arch/hp700/gsc/siop_gsc.c:1.14 --- src/sys/arch/hp700/gsc/siop_gsc.c:1.13 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/siop_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: siop_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $ */ /* $OpenBSD: siop_gsc.c,v 1.4 2007/08/23 21:01:22 kettenis Exp $ */ @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -28,7 +28,7 @@ #include <uvm/uvm_extern.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/iomod.h> #include <dev/scsipi/scsi_all.h> Index: src/sys/arch/hp700/gsc/oosiop_gsc.c diff -u src/sys/arch/hp700/gsc/oosiop_gsc.c:1.12 src/sys/arch/hp700/gsc/oosiop_gsc.c:1.13 --- src/sys/arch/hp700/gsc/oosiop_gsc.c:1.12 Tue Feb 1 18:33:24 2011 +++ src/sys/arch/hp700/gsc/oosiop_gsc.c Fri Jul 1 18:33:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: oosiop_gsc.c,v 1.12 2011/02/01 18:33:24 skrll Exp $ */ +/* $NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $ */ /* * Copyright (c) 2001 Matt Fredette. All rights reserved. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.12 2011/02/01 18:33:24 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,7 +96,7 @@ #include <machine/intr.h> #include <machine/iomod.h> #include <machine/autoconf.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <dev/ic/oosiopreg.h> #include <dev/ic/oosiopvar.h>