From 5e1a20fd26b124f8e05399745feffdb7fcc1f5a4 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Tue, 15 Jun 1999 22:15:10 +0000
Subject: [PATCH] COM_LLCONSOLE should over-ride COM_DEBUGGER request.

---
 sys/dev/sio/sio.c | 4 ++--
 sys/isa/sio.c     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 3907a0b0ba53..4665d88975df 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.245 1999/05/30 16:52:48 phk Exp $
+ *	$Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2858,7 +2858,7 @@ siocnprobe(cp)
 				siocniobase = iobase;
 				siocnunit = unit;
 			}
-			if (COM_DEBUGGER(flags)) {
+			if (COM_DEBUGGER(flags) && !COM_LLCONSOLE(flags)) {
 				printf("sio%d: gdb debugging port\n", unit);
 				siogdbiobase = iobase;
 				siogdbunit = unit;
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 3907a0b0ba53..4665d88975df 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.245 1999/05/30 16:52:48 phk Exp $
+ *	$Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2858,7 +2858,7 @@ siocnprobe(cp)
 				siocniobase = iobase;
 				siocnunit = unit;
 			}
-			if (COM_DEBUGGER(flags)) {
+			if (COM_DEBUGGER(flags) && !COM_LLCONSOLE(flags)) {
 				printf("sio%d: gdb debugging port\n", unit);
 				siogdbiobase = iobase;
 				siogdbunit = unit;