diff options
| author | nate <nate@FreeBSD.org> | 1997-01-07 15:36:34 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-01-07 15:36:34 +0000 |
| commit | 544beb570510a6d942afca887af9919b5c83a248 (patch) | |
| tree | b912f4e562d6f292092e1ddf82d3f5721e350441 /sys | |
| parent | 5260ae079232ebfeb488d05fe41fc37b3ac7358b (diff) | |
| download | FreeBSD-src-544beb570510a6d942afca887af9919b5c83a248.zip FreeBSD-src-544beb570510a6d942afca887af9919b5c83a248.tar.gz | |
> The extra include of <sys/time.h> is because apm uses microtime() and my
> <sys/param.h> doesn't include <sys/time.h>
>
> I removed the NAPM check since it's wasteful to check twice. apmprobe()
> checks the unit number, and that's the right check.
Submitted by: bde
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/apm/apm.c | 13 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 13 |
2 files changed, 4 insertions, 22 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index ea1929d..bc4f694 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -14,14 +14,9 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.49 1996/09/07 17:41:22 nate Exp $ + * $Id: apm.c,v 1.50 1997/01/06 06:01:45 nate Exp $ */ -#include "apm.h" -#if NAPM > 1 -#error only one APM device may be configured -#endif - #include <sys/param.h> #include <sys/conf.h> #include <sys/kernel.h> @@ -29,11 +24,7 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ #include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <sys/proc.h> -#include <sys/vnode.h> +#include <sys/time.h> #include <i386/isa/isa_device.h> #include <machine/apm_bios.h> #include <machine/segments.h> diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index ea1929d..bc4f694 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -14,14 +14,9 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.49 1996/09/07 17:41:22 nate Exp $ + * $Id: apm.c,v 1.50 1997/01/06 06:01:45 nate Exp $ */ -#include "apm.h" -#if NAPM > 1 -#error only one APM device may be configured -#endif - #include <sys/param.h> #include <sys/conf.h> #include <sys/kernel.h> @@ -29,11 +24,7 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ #include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <sys/proc.h> -#include <sys/vnode.h> +#include <sys/time.h> #include <i386/isa/isa_device.h> #include <machine/apm_bios.h> #include <machine/segments.h> |
