diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /arch/sparc/include/asm/ioctls.h | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'arch/sparc/include/asm/ioctls.h')
| -rw-r--r-- | arch/sparc/include/asm/ioctls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ioctls.h b/arch/sparc/include/asm/ioctls.h index 1fe6855c5c18..53f4ee009bdd 100644 --- a/arch/sparc/include/asm/ioctls.h +++ b/arch/sparc/include/asm/ioctls.h | |||
| @@ -80,6 +80,7 @@ | |||
| 80 | /* Get minor device of a pty master's FD -- Solaris equiv is ISPTM */ | 80 | /* Get minor device of a pty master's FD -- Solaris equiv is ISPTM */ |
| 81 | #define TIOCGPTN _IOR('t', 134, unsigned int) /* Get Pty Number */ | 81 | #define TIOCGPTN _IOR('t', 134, unsigned int) /* Get Pty Number */ |
| 82 | #define TIOCSPTLCK _IOW('t', 135, int) /* Lock/unlock PTY */ | 82 | #define TIOCSPTLCK _IOW('t', 135, int) /* Lock/unlock PTY */ |
| 83 | #define TIOCSIG _IOW('t', 136, int) /* Generate signal on Pty slave */ | ||
| 83 | 84 | ||
| 84 | /* Little f */ | 85 | /* Little f */ |
| 85 | #define FIOCLEX _IO('f', 1) | 86 | #define FIOCLEX _IO('f', 1) |
| @@ -132,5 +133,6 @@ | |||
| 132 | #define TIOCPKT_START 8 | 133 | #define TIOCPKT_START 8 |
| 133 | #define TIOCPKT_NOSTOP 16 | 134 | #define TIOCPKT_NOSTOP 16 |
| 134 | #define TIOCPKT_DOSTOP 32 | 135 | #define TIOCPKT_DOSTOP 32 |
| 136 | #define TIOCPKT_IOCTL 64 | ||
| 135 | 137 | ||
| 136 | #endif /* !(_ASM_SPARC_IOCTLS_H) */ | 138 | #endif /* !(_ASM_SPARC_IOCTLS_H) */ |