diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-29 07:27:48 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-29 07:27:48 +0400 |
| commit | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (patch) | |
| tree | 7b72b1fae85137435d5b98f4614df2195f612acc /include/linux/tty.h | |
| parent | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (diff) | |
| parent | 0a6047eef1c465c38aacfbdab193161b3f0cd144 (diff) | |
| download | linux-9f2fa466383ce100b90fe52cb4489d7a26bf72a9.tar.xz | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index cb35ca50a0a6..b3b807e4b050 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -57,7 +57,6 @@ struct tty_buffer { unsigned char *flag_buf_ptr; int used; int size; - int active; int commit; int read; /* Data points here */ @@ -259,7 +258,6 @@ struct tty_struct { #define TTY_DO_WRITE_WAKEUP 5 /* Call write_wakeup after queuing new */ #define TTY_PUSH 6 /* n_tty private */ #define TTY_CLOSING 7 /* ->close() in progress */ -#define TTY_DONT_FLIP 8 /* Defer buffer flip */ #define TTY_LDISC 9 /* Line discipline attached */ #define TTY_HW_COOK_OUT 14 /* Hardware can do output cooking */ #define TTY_HW_COOK_IN 15 /* Hardware can do input cooking */ |