From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Tue, 27 Mar 2007 05:32:21 +0000 (-0800)
Subject: [PATCH] tty: minor merge correction
X-Git-Tag: v2.6.21-rc6~101
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62b3e920ed7612f318126f9c9b37c6a8dcd4199e;p=linux-2.6-omap-h63xx.git

[PATCH] tty: minor merge correction

Its now used.. because we added the new definitions so enabled all the
goodies on i386

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-i386/termbits.h b/include/asm-i386/termbits.h
index 12baf1d6343..2e623769381 100644
--- a/include/asm-i386/termbits.h
+++ b/include/asm-i386/termbits.h
@@ -144,7 +144,7 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD	  002003600000	/* input baud rate (not used) */
+#define CIBAUD	  002003600000
 #define CMSPAR	  010000000000		/* mark or space (stick) parity */
 #define CRTSCTS	  020000000000		/* flow control */