diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 20:31:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 20:31:57 +0200 |
| commit | 492559af235eb56884d62553f191c0b5c4def990 (patch) | |
| tree | a5dfa19243b3b8b976e9f5b9c788cafcd3ad80c7 /include/asm-ia64/termbits.h | |
| parent | atl1: missing include (diff) | |
| parent | [IA64] Clean away some code inside some non-existent CONFIG ifdefs (diff) | |
| download | linux-492559af235eb56884d62553f191c0b5c4def990.tar.xz linux-492559af235eb56884d62553f191c0b5c4def990.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Clean away some code inside some non-existent CONFIG ifdefs
[IA64] ar.itc access must really be after xtime_lock.sequence has been read
[IA64] correctly count CPU objects in the ia64/sn hwperf interface
[IA64] arbitary speed tty ioctl support
[IA64] use machvec=dig on hpzx1 platforms
Diffstat (limited to 'include/asm-ia64/termbits.h')
| -rw-r--r-- | include/asm-ia64/termbits.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/termbits.h b/include/asm-ia64/termbits.h index 7fae3109ef47..9f162e0089ad 100644 --- a/include/asm-ia64/termbits.h +++ b/include/asm-ia64/termbits.h @@ -149,6 +149,7 @@ struct ktermios { #define HUPCL 0002000 #define CLOCAL 0004000 #define CBAUDEX 0010000 +#define BOTHER 0010000 #define B57600 0010001 #define B115200 0010002 #define B230400 0010003 @@ -164,10 +165,12 @@ struct ktermios { #define B3000000 0010015 #define B3500000 0010016 #define B4000000 0010017 -#define CIBAUD 002003600000 /* input baud rate (not used) */ +#define CIBAUD 002003600000 /* input baud rate */ #define CMSPAR 010000000000 /* mark or space (stick) parity */ #define CRTSCTS 020000000000 /* flow control */ +#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ + /* c_lflag bits */ #define ISIG 0000001 #define ICANON 0000002 |