diff options
author | Greg Kroah-Hartman | 2012-04-23 18:39:23 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-04-23 18:39:23 +0200 |
commit | 10af77c193681398e5dbe830db181d86047fcd41 (patch) | |
tree | b843eb8dae09a53efb410dd11d2132dba4fe4d15 /drivers/tty/hvc/hvc_console.h | |
parent | Linux 3.4-rc4 (diff) | |
parent | serial/8250_pci: fix suspend/resume vs init/exit quirks (diff) | |
download | kernel-qcow2-linux-10af77c193681398e5dbe830db181d86047fcd41.tar.gz kernel-qcow2-linux-10af77c193681398e5dbe830db181d86047fcd41.tar.xz kernel-qcow2-linux-10af77c193681398e5dbe830db181d86047fcd41.zip |
Merge 3.4-rc4 into tty-next
This resolves the merge problem with:
drivers/tty/serial/pch_uart.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 */ |