diff options
| -rw-r--r-- | sys/arch/i386/i386/apm.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 3 | ||||
| -rw-r--r-- | sys/arch/i386/include/conf.h | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index 2884b3ec4c1..f15842bc0e4 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.9 1997/09/22 14:55:13 deraadt Exp $ */ +/* $OpenBSD: apm.c,v 1.10 1997/09/24 22:18:12 mickey Exp $ */ /*- * Copyright (c) 1995 John T. Kohl. All rights reserved. @@ -44,7 +44,6 @@ #include <sys/systm.h> #include <sys/signalvar.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/map.h> #include <sys/proc.h> #include <sys/user.h> @@ -53,6 +52,7 @@ #include <sys/fcntl.h> #include <sys/ioctl.h> +#include <machine/conf.h> #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/gdt.h> @@ -104,8 +104,6 @@ struct cfdriver apm_cd = { NULL, "apm", DV_DULL }; -cdev_decl(apm); /* XXX should it be int <sys/conf.h> ? */ - struct apm_connect_info apminfo = { 0 }; u_char apm_majver; u_char apm_minver; diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index f76aac4a2c4..812645d63c3 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.34 1997/09/21 04:27:54 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.35 1997/09/24 22:18:13 mickey Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -160,7 +160,6 @@ cdev_decl(audio); cdev_decl(svr4_net); #include "joy.h" #include "apm.h" -cdev_decl(apm); #include "pctr.h" cdev_decl(pctr); #include "bios.h" diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h index 5c791b14abf..25a4607a3a0 100644 --- a/sys/arch/i386/include/conf.h +++ b/sys/arch/i386/include/conf.h @@ -71,3 +71,4 @@ cdev_decl(joy); 0, seltrue, (dev_type_mmap((*))) enodev } cdev_decl(bios); +cdev_decl(apm); |