diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 11:31:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 11:31:57 -0700 |
| commit | 492559af235eb56884d62553f191c0b5c4def990 (patch) | |
| tree | a5dfa19243b3b8b976e9f5b9c788cafcd3ad80c7 /include/asm-ia64/ioctls.h | |
| parent | d3676756968eef4a31da11be5addc4eec1b6db2c (diff) | |
| parent | 4f8de2745629330d78776282ea490fece22ee5e4 (diff) | |
| download | linux-492559af235eb56884d62553f191c0b5c4def990.tar.bz2 | |
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/ioctls.h')
| -rw-r--r-- | include/asm-ia64/ioctls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ia64/ioctls.h b/include/asm-ia64/ioctls.h index 31ee521aeb7a..f41b636a0bf6 100644 --- a/include/asm-ia64/ioctls.h +++ b/include/asm-ia64/ioctls.h @@ -53,6 +53,10 @@ #define TIOCSBRK 0x5427 /* BSD compatibility */ #define TIOCCBRK 0x5428 /* BSD compatibility */ #define TIOCGSID 0x5429 /* Return the session ID of FD */ +#define TCGETS2 _IOR('T',0x2A, struct termios2) +#define TCSETS2 _IOW('T',0x2B, struct termios2) +#define TCSETSW2 _IOW('T',0x2C, struct termios2) +#define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ |