diff options
| author | Paul Mundt | 2010-12-20 16:40:51 +0100 |
|---|---|---|
| committer | Paul Mundt | 2010-12-20 16:40:51 +0100 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /include/linux/tty.h | |
| parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
| parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
| download | kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.gz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 032d79ff1d9d..54e4eaaa0561 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -366,6 +366,7 @@ struct tty_file_private { #define TTY_HUPPED 18 /* Post driver->hangup() */ #define TTY_FLUSHING 19 /* Flushing to ldisc in progress */ #define TTY_FLUSHPENDING 20 /* Queued buffer flush pending */ +#define TTY_HUPPING 21 /* ->hangup() in progress */ #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty)) |