summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/clock.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
committerphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
commitee871b6440719fbe58a0cb8e994ad543265f4e1a (patch)
tree5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/i386/isa/clock.c
parentf0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff)
downloadFreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip
FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/i386/isa/clock.c')
-rw-r--r--sys/i386/isa/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 1c8d8f6..188e20b 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.141 1999/07/28 20:22:30 msmith Exp $
+ * $Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
*/
/*
@@ -59,10 +59,10 @@
#include <sys/lock.h>
#endif
#include <sys/sysctl.h>
+#include <sys/cons.h>
#include <machine/clock.h>
#ifdef CLK_CALIBRATION_LOOP
-#include <machine/cons.h>
#endif
#include <machine/cputypes.h>
#include <machine/frame.h>
OpenPOWER on IntegriCloud