diff options
| -rw-r--r-- | sys/i386/i386/userconfig.c | 15 | ||||
| -rw-r--r-- | sys/pccard/pccard.c | 6 | ||||
| -rw-r--r-- | sys/pccard/pcic.c | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index f2ba1cf..c4495f3 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.39 1995/12/10 13:36:33 phk Exp $ + ** $Id: userconfig.c,v 1.40 1996/02/04 10:03:19 pst Exp $ **/ /** @@ -107,12 +107,15 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/malloc.h> + +#include <machine/clock.h> +#include <machine/cons.h> #include <machine/md_var.h> -#include <i386/i386/cons.h> -#include <i386/include/clock.h> + #include <i386/isa/isa_device.h> -#include <sys/kernel.h> + #include <pci/pcivar.h> static struct isa_device *devtabs[] = { isa_devtab_bio, isa_devtab_tty, isa_devtab_net, @@ -2144,12 +2147,12 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.39 1995/12/10 13:36:33 phk Exp $ + * $Id: userconfig.c,v 1.40 1996/02/04 10:03:19 pst Exp $ */ +#include "scbus.h" #include <scsi/scsiconf.h> -#include "scbus.h" #define PARM_DEVSPEC 0x1 #define PARM_INT 0x2 diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index a803e8c..8f42572 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -47,17 +47,17 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ +#include <machine/clock.h> +#include <machine/laptops.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> -#include <i386/include/clock.h> #include <pccard/card.h> #include <pccard/driver.h> #include <pccard/slot.h> -#include <i386/include/laptops.h> - extern struct kern_devconf kdc_cpu0; struct kern_devconf kdc_pccard0 = { diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index af33749..5499dd3 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -49,6 +49,7 @@ #include <sys/devconf.h> #include <machine/clock.h> +#include <machine/laptops.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> @@ -59,8 +60,6 @@ #include <pccard/driver.h> #include <pccard/slot.h> -#include <i386/include/laptops.h> - extern struct kern_devconf kdc_pccard0; struct kern_devconf kdc_pcic[PCIC_MAX_SLOTS] = { |
