From ee871b6440719fbe58a0cb8e994ad543265f4e1a Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 9 Aug 1999 10:35:05 +0000
Subject: Merge the cons.c and cons.h to the best of my ability.  alpha may or
 may not compile, I can't test it.

---
 sys/kern/subr_smp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sys/kern/subr_smp.c')

diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index e81efef..969cd08 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.105 1999/06/23 23:02:38 msmith Exp $
+ *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -45,6 +45,7 @@
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
+#include <sys/cons.h>	/* cngetc() */
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -73,8 +74,6 @@
 #include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
-#include <i386/i386/cons.h>	/* cngetc() */
-
 #if defined(APIC_IO)
 #include <machine/md_var.h>		/* setidt() */
 #include <i386/isa/icu.h>		/* IPIs */
-- 
cgit v1.1