diff options
-rw-r--r-- | sys/amd64/isa/isa.c | 3 | ||||
-rw-r--r-- | sys/amd64/pci/pci_bus.c | 4 | ||||
-rw-r--r-- | sys/amd64/pci/pci_cfgreg.c | 4 | ||||
-rw-r--r-- | sys/dev/fdc/fdc.c | 3 | ||||
-rw-r--r-- | sys/dev/mcd/mcd.c | 3 | ||||
-rw-r--r-- | sys/dev/pci/pci.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/aha1542.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/diskslice_machdep.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/fd.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/isa.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/mcd.c | 3 | ||||
-rw-r--r-- | sys/i386/isa/pcibus.c | 4 | ||||
-rw-r--r-- | sys/i386/pci/pci_bus.c | 4 | ||||
-rw-r--r-- | sys/i386/pci/pci_cfgreg.c | 4 | ||||
-rw-r--r-- | sys/i386/pci/pci_pir.c | 4 | ||||
-rw-r--r-- | sys/isa/fd.c | 3 | ||||
-rw-r--r-- | sys/kern/subr_diskmbr.c | 3 | ||||
-rw-r--r-- | sys/net/bpf.c | 3 | ||||
-rw-r--r-- | sys/pci/meteor.c | 1 | ||||
-rw-r--r-- | sys/pci/ncr.c | 10 | ||||
-rw-r--r-- | sys/pci/pci.c | 4 | ||||
-rw-r--r-- | sys/pci/pcisupport.c | 4 | ||||
-rw-r--r-- | sys/scsi/scsi_driver.c | 4 | ||||
-rw-r--r-- | sys/scsi/scsiconf.c | 3 |
24 files changed, 27 insertions, 60 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 2701995..c414461 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.64 1996/03/10 02:10:27 jkh Exp $ + * $Id: isa.c,v 1.65 1996/03/10 07:04:44 gibbs Exp $ */ /* @@ -57,7 +57,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/cpu.h> #include <i386/isa/isa_device.h> #include <i386/isa/isa.h> #include <i386/isa/icu.h> diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index b4c3b8a..be2e364 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index b4c3b8a..be2e364 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 91e6066..7144602 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.84 1996/04/02 04:51:04 scrappy Exp $ + * $Id: fd.c,v 1.85 1996/04/07 14:46:42 bde Exp $ * */ @@ -65,7 +65,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/diskslice.h> -#include <machine/cpu.h> #include <sys/buf.h> #include <sys/uio.h> #include <sys/malloc.h> diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index a364c04..903f5c7 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.74 1996/03/17 13:33:42 ache Exp $ + * $Id: mcd.c,v 1.75 1996/03/28 14:28:45 scrappy Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -62,7 +62,6 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/disklabel.h> #include <sys/devconf.h> #include <sys/kernel.h> -#include <machine/cpu.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 7b1bfb2..13ca4c1 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.45 1996/02/17 23:57:03 se Exp $ +** $Id: pci.c,v 1.46 1996/02/19 00:30:40 se Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -55,8 +55,6 @@ #include <sys/proc.h> /* declaration of wakeup(), used by vm.h */ #include <sys/devconf.h> -#include <machine/cpu.h> /* bootverbose */ - #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 729b31d..5447efc 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.56 1996/03/10 07:04:42 gibbs Exp $ + * $Id: aha1542.c,v 1.57 1996/03/31 18:19:38 gibbs Exp $ */ /* @@ -32,7 +32,6 @@ #include <sys/proc.h> #include <machine/clock.h> -#include <machine/cpu.h> /* XXX for bootverbose: a funny place */ #include <machine/stdarg.h> #include <vm/vm.h> diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c index 481cef1..4610e5f 100644 --- a/sys/i386/isa/diskslice_machdep.c +++ b/sys/i386/isa/diskslice_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $ + * $Id: diskslice_machdep.c,v 1.19 1996/03/02 01:49:38 dyson Exp $ */ #include <stddef.h> @@ -48,7 +48,6 @@ #include <sys/malloc.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <machine/cpu.h> #define TRACE(str) do { if (dsi_debug) printf str; } while (0) diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 91e6066..7144602 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.84 1996/04/02 04:51:04 scrappy Exp $ + * $Id: fd.c,v 1.85 1996/04/07 14:46:42 bde Exp $ * */ @@ -65,7 +65,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/diskslice.h> -#include <machine/cpu.h> #include <sys/buf.h> #include <sys/uio.h> #include <sys/malloc.h> diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 2701995..c414461 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.64 1996/03/10 02:10:27 jkh Exp $ + * $Id: isa.c,v 1.65 1996/03/10 07:04:44 gibbs Exp $ */ /* @@ -57,7 +57,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/cpu.h> #include <i386/isa/isa_device.h> #include <i386/isa/isa.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index a364c04..903f5c7 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.74 1996/03/17 13:33:42 ache Exp $ + * $Id: mcd.c,v 1.75 1996/03/28 14:28:45 scrappy Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -62,7 +62,6 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/disklabel.h> #include <sys/devconf.h> #include <sys/kernel.h> -#include <machine/cpu.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index b4c3b8a..be2e364 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index b4c3b8a..be2e364 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index b4c3b8a..be2e364 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index b4c3b8a..be2e364 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $ +** $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -41,8 +41,6 @@ #include <sys/systm.h> #include <sys/kernel.h> -#include <machine/cpu.h> /* bootverbose */ - #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 91e6066..7144602 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.84 1996/04/02 04:51:04 scrappy Exp $ + * $Id: fd.c,v 1.85 1996/04/07 14:46:42 bde Exp $ * */ @@ -65,7 +65,6 @@ #include <machine/ioctl_fd.h> #include <sys/disklabel.h> #include <sys/diskslice.h> -#include <machine/cpu.h> #include <sys/buf.h> #include <sys/uio.h> #include <sys/malloc.h> diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index 481cef1..4610e5f 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $ + * $Id: diskslice_machdep.c,v 1.19 1996/03/02 01:49:38 dyson Exp $ */ #include <stddef.h> @@ -48,7 +48,6 @@ #include <sys/malloc.h> #include <sys/syslog.h> #include <sys/systm.h> -#include <machine/cpu.h> #define TRACE(str) do { if (dsi_debug) printf str; } while (0) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 4eebdcc..4d63b1b 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * - * $Id: bpf.c,v 1.22 1996/02/06 18:51:04 wollman Exp $ + * $Id: bpf.c,v 1.23 1996/03/28 14:33:11 scrappy Exp $ */ #include "bpfilter.h" @@ -53,7 +53,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <machine/cpu.h> /* for bootverbose */ #include <sys/mbuf.h> #include <sys/buf.h> #include <sys/time.h> diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index efb6664..cf19e00 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -140,7 +140,6 @@ #include <sys/devfsext.h> #endif /* DEVFS */ #include <machine/clock.h> -#include <machine/cpu.h> /* bootverbose */ #include <vm/vm.h> #include <vm/vm_kern.h> diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 70d9a26..f9b8257 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.68 1996/03/19 15:03:00 bde Exp $ +** $Id: ncr.c,v 1.69 1996/03/31 03:17:50 gibbs Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -182,12 +182,12 @@ #include <sys/malloc.h> #include <sys/buf.h> #include <sys/kernel.h> +#ifdef __NetBSD__ +#define bootverbose 1 +#endif #include <sys/sysctl.h> #ifndef __NetBSD__ #include <machine/clock.h> -#include <machine/cpu.h> /* bootverbose */ -#else -#define bootverbose 1 #endif #include <vm/vm.h> #include <vm/vm_param.h> @@ -1254,7 +1254,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.68 1996/03/19 15:03:00 bde Exp $\n"; + "\n$Id: ncr.c,v 1.69 1996/03/31 03:17:50 gibbs Exp $\n"; static u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 7b1bfb2..13ca4c1 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pci.c,v 1.45 1996/02/17 23:57:03 se Exp $ +** $Id: pci.c,v 1.46 1996/02/19 00:30:40 se Exp $ ** ** General subroutines for the PCI bus. ** pci_configure () @@ -55,8 +55,6 @@ #include <sys/proc.h> /* declaration of wakeup(), used by vm.h */ #include <sys/devconf.h> -#include <machine/cpu.h> /* bootverbose */ - #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c index c91b83b..713ea03 100644 --- a/sys/pci/pcisupport.c +++ b/sys/pci/pcisupport.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcisupport.c,v 1.31 1996/01/28 22:15:46 wollman Exp $ +** $Id: pcisupport.c,v 1.32 1996/02/17 23:57:04 se Exp $ ** ** Device driver for DEC/INTEL PCI chipsets. ** @@ -48,8 +48,6 @@ #include <sys/kernel.h> #include <sys/devconf.h> -#include <machine/cpu.h> - #include <pci/pcivar.h> #include <pci/pcireg.h> diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c index 49fddbe..6a35202 100644 --- a/sys/scsi/scsi_driver.c +++ b/sys/scsi/scsi_driver.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.c,v 1.13 1996/01/20 15:05:50 joerg Exp $ + * $Id: scsi_driver.c,v 1.14 1996/03/10 07:13:08 gibbs Exp $ * */ #include <sys/types.h> @@ -47,8 +47,6 @@ #include <sys/malloc.h> #include <sys/fcntl.h> -#include <machine/cpu.h> /* XXX For bootverbose (funny place) */ - #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <scsi/scsi_driver.h> diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index c3c496f..9ca1685 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -16,7 +16,7 @@ * * New configuration setup: dufault@hda.com * - * $Id: scsiconf.c,v 1.56 1996/03/09 07:13:57 peter Exp $ + * $Id: scsiconf.c,v 1.57 1996/03/10 07:13:10 gibbs Exp $ */ #include "opt_scsi.h" @@ -31,7 +31,6 @@ #include <sys/conf.h> #include <machine/clock.h> -#include <machine/cpu.h> /* XXX For bootverbose (funny place) */ #include "scbus.h" |