diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 23:41:41 +0100 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 23:41:41 +0100 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-x86_64/ioctls.h | |
| parent | [CPUFREQ] Longhaul - Add support for CN400 (diff) | |
| parent | [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff) | |
| download | linux-c4366889dda8110247be59ca41fddb82951a8c26.tar.xz linux-c4366889dda8110247be59ca41fddb82951a8c26.zip | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-x86_64/ioctls.h')
| -rw-r--r-- | include/asm-x86_64/ioctls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86_64/ioctls.h b/include/asm-x86_64/ioctls.h index 62caf8b6e4e1..3fc0b15a0d7e 100644 --- a/include/asm-x86_64/ioctls.h +++ b/include/asm-x86_64/ioctls.h @@ -46,6 +46,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 */ |