diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-03-27 01:32:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 12:05:15 -0400 |
| commit | 62b3e920ed7612f318126f9c9b37c6a8dcd4199e (patch) | |
| tree | a842834b8fb37d956dde48cb8461c2fd3b973fa4 /include/asm-i386/termbits.h | |
| parent | d75e26a8298f84bca66374e98fa69049f26083ba (diff) | |
[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>
Diffstat (limited to 'include/asm-i386/termbits.h')
| -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 { | |||
| 144 | #define B3000000 0010015 | 144 | #define B3000000 0010015 |
| 145 | #define B3500000 0010016 | 145 | #define B3500000 0010016 |
| 146 | #define B4000000 0010017 | 146 | #define B4000000 0010017 |
| 147 | #define CIBAUD 002003600000 /* input baud rate (not used) */ | 147 | #define CIBAUD 002003600000 |
| 148 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | 148 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 149 | #define CRTSCTS 020000000000 /* flow control */ | 149 | #define CRTSCTS 020000000000 /* flow control */ |
| 150 | 150 | ||