diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-05 00:13:55 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-05 00:13:55 +0400 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /drivers/tty/hvc/hvc_console.h | |
| parent | 6795a524f0b049ceb5417d5036ab5e233345b900 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| download | linux-404c3bc30cb1361e1b3533643326ab472d24a618.tar.xz | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'drivers/tty/hvc/hvc_console.h')
| -rw-r--r-- | drivers/tty/hvc/hvc_console.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h index c335a1492a54..674d23cb919a 100644 --- a/drivers/tty/hvc/hvc_console.h +++ b/drivers/tty/hvc/hvc_console.h @@ -46,10 +46,9 @@ #define HVC_ALLOC_TTY_ADAPTERS 8 struct hvc_struct { + struct tty_port port; spinlock_t lock; int index; - struct tty_struct *tty; - int count; int do_wakeup; char *outbuf; int outbuf_size; @@ -61,7 +60,6 @@ struct hvc_struct { struct winsize ws; struct work_struct tty_resize; struct list_head next; - struct kref kref; /* ref count & hvc_struct lifetime */ }; /* implemented by a low level driver */ |