diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-03-27 07:32:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 18:05:15 +0200 |
commit | 62b3e920ed7612f318126f9c9b37c6a8dcd4199e (patch) | |
tree | a842834b8fb37d956dde48cb8461c2fd3b973fa4 | |
parent | [PATCH] uml: fix epoll (diff) | |
download | linux-62b3e920ed7612f318126f9c9b37c6a8dcd4199e.tar.xz linux-62b3e920ed7612f318126f9c9b37c6a8dcd4199e.zip |
[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>
-rw-r--r-- | include/asm-i386/termbits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/termbits.h b/include/asm-i386/termbits.h index 12baf1d6343f..2e6237693814 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 */ |