diff options
Diffstat (limited to 'include/linux/hayesesp.h')
| -rw-r--r-- | include/linux/hayesesp.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h index 2177ee5b2fe2..940aeb51d53f 100644 --- a/include/linux/hayesesp.h +++ b/include/linux/hayesesp.h | |||
| @@ -76,11 +76,10 @@ struct hayes_esp_config { | |||
| 76 | 76 | ||
| 77 | struct esp_struct { | 77 | struct esp_struct { |
| 78 | int magic; | 78 | int magic; |
| 79 | struct tty_port port; | ||
| 79 | spinlock_t lock; | 80 | spinlock_t lock; |
| 80 | int port; | 81 | int io_port; |
| 81 | int irq; | 82 | int irq; |
| 82 | int flags; /* defined in tty.h */ | ||
| 83 | struct tty_struct *tty; | ||
| 84 | int read_status_mask; | 83 | int read_status_mask; |
| 85 | int ignore_status_mask; | 84 | int ignore_status_mask; |
| 86 | int timeout; | 85 | int timeout; |
| @@ -93,14 +92,10 @@ struct esp_struct { | |||
| 93 | int MCR; /* Modem control register */ | 92 | int MCR; /* Modem control register */ |
| 94 | unsigned long last_active; | 93 | unsigned long last_active; |
| 95 | int line; | 94 | int line; |
| 96 | int count; /* # of fd on device */ | ||
| 97 | int blocked_open; /* # of blocked opens */ | ||
| 98 | unsigned char *xmit_buf; | 95 | unsigned char *xmit_buf; |
| 99 | int xmit_head; | 96 | int xmit_head; |
| 100 | int xmit_tail; | 97 | int xmit_tail; |
| 101 | int xmit_cnt; | 98 | int xmit_cnt; |
| 102 | wait_queue_head_t open_wait; | ||
| 103 | wait_queue_head_t close_wait; | ||
| 104 | wait_queue_head_t delta_msr_wait; | 99 | wait_queue_head_t delta_msr_wait; |
| 105 | wait_queue_head_t break_wait; | 100 | wait_queue_head_t break_wait; |
| 106 | struct async_icount icount; /* kernel counters for the 4 input interrupts */ | 101 | struct async_icount icount; /* kernel counters for the 4 input interrupts */ |