use machine/conf.h instead of sys/conf.h and/or machine/cpuconf.h

This commit is contained in:
cgd 1997-04-07 06:09:00 +00:00
parent f65f7e9b21
commit 21598de043
20 changed files with 42 additions and 42 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.21 1997/04/07 05:19:01 cgd Exp $ */
/* $NetBSD: autoconf.c,v 1.22 1997/04/07 06:09:00 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -48,14 +48,13 @@
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/disklabel.h>
#include <sys/conf.h>
#include <sys/reboot.h>
#include <sys/device.h>
#include <dev/cons.h>
#include <machine/autoconf.h>
#include <machine/prom.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
struct device *booted_device;
int booted_partition;

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_2100_a50.c,v 1.23 1997/04/07 05:19:03 cgd Exp $ */
/* $NetBSD: dec_2100_a50.c,v 1.24 1997/04/07 06:09:01 cgd Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/isa/isavar.h>
#include <dev/isa/comreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_3000_300.c,v 1.12 1997/04/07 05:19:05 cgd Exp $ */
/* $NetBSD: dec_3000_300.c,v 1.13 1997/04/07 06:09:02 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -33,7 +33,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/tc/tcvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_3000_500.c,v 1.11 1997/04/07 05:19:06 cgd Exp $ */
/* $NetBSD: dec_3000_500.c,v 1.12 1997/04/07 06:09:02 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -33,7 +33,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/tc/tcvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_axppci_33.c,v 1.21 1997/04/07 05:19:08 cgd Exp $ */
/* $NetBSD: dec_axppci_33.c,v 1.22 1997/04/07 06:09:03 cgd Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/isa/isavar.h>
#include <dev/isa/comreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb164.c,v 1.9 1997/04/07 05:19:09 cgd Exp $ */
/* $NetBSD: dec_eb164.c,v 1.10 1997/04/07 06:09:04 cgd Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/isa/isavar.h>
#include <dev/isa/comreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn20aa.c,v 1.21 1997/04/07 05:19:10 cgd Exp $ */
/* $NetBSD: dec_kn20aa.c,v 1.22 1997/04/07 06:09:05 cgd Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -35,7 +35,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/isa/isavar.h>
#include <dev/isa/comreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_kn8ae.c,v 1.4 1997/04/07 05:19:12 cgd Exp $ */
/* $NetBSD: dec_kn8ae.c,v 1.5 1997/04/07 06:09:05 cgd Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@ -38,7 +38,7 @@
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <dev/isa/isavar.h>
#include <dev/isa/comreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.72 1997/04/07 05:40:45 cgd Exp $ */
/* $NetBSD: machdep.c,v 1.73 1997/04/07 06:09:06 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -36,7 +36,6 @@
#include <sys/buf.h>
#include <sys/reboot.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/file.h>
#ifdef REAL_CLISTS
#include <sys/clist.h>
@ -75,7 +74,7 @@
#include <machine/reg.h>
#include <machine/rpb.h>
#include <machine/prom.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
#include <net/netisr.h>
#include <net/if.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.18 1997/04/07 05:19:17 cgd Exp $ */
/* $NetBSD: mainbus.c,v 1.19 1997/04/07 06:09:07 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -34,7 +34,7 @@
#include <machine/autoconf.h>
#include <machine/rpb.h>
#include <machine/cpuconf.h>
#include <machine/conf.h>
struct mainbus_softc {
struct device sc_dv;

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.12 1997/04/07 00:19:17 cgd Exp $ */
/* $NetBSD: mem.c,v 1.13 1997/04/07 06:09:08 cgd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -47,13 +47,13 @@
#include <machine/options.h> /* Pull in config options headers */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/systm.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <machine/cpu.h>
#include <machine/conf.h>
#include <vm/vm.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: promcons.c,v 1.6 1997/04/07 00:19:21 cgd Exp $ */
/* $NetBSD: promcons.c,v 1.7 1997/04/07 06:09:09 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -36,7 +36,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/kernel.h>
@ -44,6 +43,7 @@
#include <sys/types.h>
#include <sys/device.h>
#include <machine/conf.h>
#include <machine/prom.h>
static struct tty *prom_tty[1];

View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbd.c,v 1.16 1997/04/06 23:22:28 cgd Exp $ */
/* $NetBSD: pckbd.c,v 1.17 1997/04/07 06:09:10 cgd Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -46,7 +46,6 @@
#include <machine/options.h> /* Pull in config options headers */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
@ -56,6 +55,7 @@
#include <machine/intr.h>
#include <machine/bus.h>
#include <machine/conf.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.15 1997/04/07 02:01:30 cgd Exp $ */
/* $NetBSD: tga.c,v 1.16 1997/04/07 06:09:11 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -35,11 +35,11 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/conf.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.9 1997/04/06 22:31:48 cgd Exp $ */
/* $NetBSD: cfb.c,v 1.10 1997/04/07 06:09:13 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -35,11 +35,11 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/conf.h>
#include <dev/tc/tcvar.h>
#include <machine/cfbreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: scc.c,v 1.30 1997/04/06 22:31:56 cgd Exp $ */
/* $NetBSD: scc.c,v 1.31 1997/04/07 06:09:14 cgd Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@ -82,7 +82,6 @@
#include <sys/proc.h>
#include <sys/map.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/kernel.h>
@ -103,6 +102,7 @@
#endif
#include <machine/rpb.h>
#include <machine/conf.h>
#include <dev/tc/tcvar.h>
#include <alpha/tc/ioasicreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.9 1997/04/06 22:31:59 cgd Exp $ */
/* $NetBSD: sfb.c,v 1.10 1997/04/07 06:09:15 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -35,11 +35,11 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/conf.h>
#include <dev/tc/tcvar.h>
#include <machine/sfbreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd.c,v 1.4 1997/04/06 20:09:05 cgd Exp $ */
/* $NetBSD: kbd.c,v 1.5 1997/04/07 06:09:16 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -53,7 +53,6 @@
#include <machine/options.h> /* Pull in config options headers */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
@ -64,6 +63,7 @@
#include <sys/signalvar.h>
#include <machine/autoconf.h>
#include <machine/conf.h>
#include <machine/vuid_event.h>
#include <machine/kbio.h> /* XXX FOR KIOCSDIRECT */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ms.c,v 1.4 1997/04/06 20:09:06 cgd Exp $ */
/* $NetBSD: ms.c,v 1.5 1997/04/07 06:09:17 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -51,7 +51,6 @@
#include <machine/options.h> /* Pull in config options headers */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/proc.h>
@ -60,6 +59,8 @@
#include <sys/tty.h>
#include <sys/signalvar.h>
#include <machine/conf.h>
#include <machine/vuid_event.h>
#include <alpha/wscons/event_var.h>
#include <alpha/wscons/wsconsvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: wscons.c,v 1.12 1997/04/06 20:09:07 cgd Exp $ */
/* $NetBSD: wscons.c,v 1.13 1997/04/07 06:09:18 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
@ -40,6 +39,8 @@
#include <sys/tty.h>
#include <sys/termios.h>
#include <machine/conf.h>
#include <dev/cons.h>
#include <alpha/wscons/wsconsvar.h>
#include <alpha/wscons/wscons_emul.h>