From 835b7809abf864ccbefd066afffffd0cedc3f89e Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Tue, 8 Mar 1994 15:17:41 +0000
Subject: [PATCH] Modified pccnprobe to not set cn_tp = CONSOLE_TTY if
 __FreeBSD__ is defined. This code should probably be yanked out.

---
 sys/dev/syscons/syscons.c | 4 ++--
 sys/i386/isa/syscons.c    | 4 ++--
 sys/isa/syscons.c         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 43bcf3cd0f0e..565e8437dcdf 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from:@(#)syscons.c	1.3 940129
- *	$Id: syscons.c,v 1.36 1994/03/02 20:28:38 guido Exp $
+ *	$Id: syscons.c,v 1.37 1994/03/06 20:56:26 guido Exp $
  *
  */
 
@@ -1102,7 +1102,7 @@ void pccnprobe(struct consdev *cp)
 	/* initialize required fields */
 	cp->cn_dev = makedev(maj, NCONS);
 	cp->cn_pri = CN_INTERNAL;
-#if defined(__386BSD__)
+#if defined(__386BSD__) && !defined(__FreeBSD__)
 	cp->cn_tp = CONSOLE_TTY;
 #endif
 }
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 43bcf3cd0f0e..565e8437dcdf 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from:@(#)syscons.c	1.3 940129
- *	$Id: syscons.c,v 1.36 1994/03/02 20:28:38 guido Exp $
+ *	$Id: syscons.c,v 1.37 1994/03/06 20:56:26 guido Exp $
  *
  */
 
@@ -1102,7 +1102,7 @@ void pccnprobe(struct consdev *cp)
 	/* initialize required fields */
 	cp->cn_dev = makedev(maj, NCONS);
 	cp->cn_pri = CN_INTERNAL;
-#if defined(__386BSD__)
+#if defined(__386BSD__) && !defined(__FreeBSD__)
 	cp->cn_tp = CONSOLE_TTY;
 #endif
 }
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 43bcf3cd0f0e..565e8437dcdf 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from:@(#)syscons.c	1.3 940129
- *	$Id: syscons.c,v 1.36 1994/03/02 20:28:38 guido Exp $
+ *	$Id: syscons.c,v 1.37 1994/03/06 20:56:26 guido Exp $
  *
  */
 
@@ -1102,7 +1102,7 @@ void pccnprobe(struct consdev *cp)
 	/* initialize required fields */
 	cp->cn_dev = makedev(maj, NCONS);
 	cp->cn_pri = CN_INTERNAL;
-#if defined(__386BSD__)
+#if defined(__386BSD__) && !defined(__FreeBSD__)
 	cp->cn_tp = CONSOLE_TTY;
 #endif
 }