diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /drivers/char/riscom8.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'drivers/char/riscom8.h')
| -rw-r--r-- | drivers/char/riscom8.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/char/riscom8.h b/drivers/char/riscom8.h index cdfdf439447..c9876b3f971 100644 --- a/drivers/char/riscom8.h +++ b/drivers/char/riscom8.h @@ -66,23 +66,15 @@ struct riscom_board { struct riscom_port { int magic; + struct tty_port port; int baud_base; - int flags; - struct tty_struct * tty; - int count; - int blocked_open; int timeout; - int close_delay; - unsigned char * xmit_buf; int custom_divisor; int xmit_head; int xmit_tail; int xmit_cnt; - wait_queue_head_t open_wait; - wait_queue_head_t close_wait; short wakeup_chars; short break_length; - unsigned short closing_wait; unsigned char mark_mask; unsigned char IER; unsigned char MSVR; |