]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[PATCH] tty: minor merge correction
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Tue, 27 Mar 2007 05:32:21 +0000 (21:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Mar 2007 16:05:15 +0000 (09:05 -0700)
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>
include/asm-i386/termbits.h

index 12baf1d6343ff7be1c6155cff33f650658f666bc..2e6237693814e8d6d50e738b38b3ff36579cc80d 100644 (file)
@@ -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 */