diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-16 23:09:34 +0200 |
| commit | 300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch) | |
| tree | 7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /arch/arm/include/asm/ioctls.h | |
| parent | sparc: Really fix "console=" for serial consoles. (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.xz linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/include/asm/ioctls.h')
| -rw-r--r-- | arch/arm/include/asm/ioctls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/ioctls.h b/arch/arm/include/asm/ioctls.h index 7f0b6d13296a..0b30894b5482 100644 --- a/arch/arm/include/asm/ioctls.h +++ b/arch/arm/include/asm/ioctls.h @@ -52,6 +52,7 @@ #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 */ +#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ #define TIOCGRS485 0x542E #define TIOCSRS485 0x542F @@ -81,6 +82,7 @@ #define TIOCPKT_START 8 #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 +#define TIOCPKT_IOCTL 64 #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ |