From bfb4fa0c88fec6bc3833beed019457abab6b2e7e Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Tue, 1 Apr 2003 21:27:24 +0000
Subject: [PATCH] There are two #defines of CONSPEED in here; didn't make sense
 to me.

---
 sys/arch/evbarm/integrator/integrator_machdep.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/arch/evbarm/integrator/integrator_machdep.c b/sys/arch/evbarm/integrator/integrator_machdep.c
index 2a326a8e2096..4e7a888ed525 100644
--- a/sys/arch/evbarm/integrator/integrator_machdep.c
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: integrator_machdep.c,v 1.29 2003/01/17 22:45:40 thorpej Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.30 2003/04/01 21:27:24 mycroft Exp $	*/
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -200,9 +200,8 @@ void	consinit(void);
  * Define the default console speed for the board.  This is generally
  * what the firmware provided with the board defaults to.
  */
-#define CONSPEED B115200
 #ifndef CONSPEED
-#define CONSPEED B9600	/* TTYDEF_SPEED */
+#define CONSPEED B115200
 #endif
 #ifndef CONMODE
 #define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */