[PATCH] tty: minor merge correction

From: Alan Cox
Date: Fri Mar 23 2007 - 13:52:34 EST


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

Signed-off-by: Alan Cox <alan@xxxxxxxxxx>

[and a signed off for the ide merge oddments I just posted without]

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc4-mm1/include/asm-i386/termbits.h linux-2.6.21-rc4-mm1/include/asm-i386/termbits.h
--- linux.vanilla-2.6.21-rc4-mm1/include/asm-i386/termbits.h 2007-03-23 11:49:51.000000000 +0000
+++ linux-2.6.21-rc4-mm1/include/asm-i386/termbits.h 2007-03-23 13:25:35.000000000 +0000
@@ -156,7 +156,7 @@
#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 */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/