diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-09-20 00:13:31 +0400 |
|---|---|---|
| committer | Live-CD User <linux@linux.site> | 2009-09-20 00:13:31 +0400 |
| commit | bdc04e3174e18f475289fa8f4144f66686326b7e (patch) | |
| tree | c0bf03c8d6df1629bfa26b686fe65ffb0c87aeb7 /include/linux | |
| parent | a2bceae065ed8c4f552b35c4dde4cc2db05ce9e3 (diff) | |
| download | linux-bdc04e3174e18f475289fa8f4144f66686326b7e.tar.xz | |
serial: move delta_msr_wait into the tty_port
This is used by various drivers not just serial and can be extracted
as commonality
Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cyclades.h | 1 | ||||
| -rw-r--r-- | include/linux/hayesesp.h | 1 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 1 | ||||
| -rw-r--r-- | include/linux/tty.h | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index bbebef7713b3..a5049eaf782d 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -578,7 +578,6 @@ struct cyclades_port { struct cyclades_idle_stats idle_stats; struct cyclades_icount icount; struct completion shutdown_wait; - wait_queue_head_t delta_msr_wait; int throttle; }; diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h index 940aeb51d53f..92b08cfe4a75 100644 --- a/include/linux/hayesesp.h +++ b/include/linux/hayesesp.h @@ -96,7 +96,6 @@ struct esp_struct { int xmit_head; int xmit_tail; int xmit_cnt; - wait_queue_head_t delta_msr_wait; wait_queue_head_t break_wait; struct async_icount icount; /* kernel counters for the 4 input interrupts */ struct hayes_esp_config config; /* port configuration */ diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 27767ea5fa29..bcafecd3b7c1 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -349,7 +349,6 @@ struct uart_state { struct circ_buf xmit; struct tasklet_struct tlet; - wait_queue_head_t delta_msr_wait; struct uart_port *uart_port; }; diff --git a/include/linux/tty.h b/include/linux/tty.h index 9fdc3d84baad..0daa8a72b176 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -203,6 +203,7 @@ struct tty_port { int count; /* Usage count */ wait_queue_head_t open_wait; /* Open waiters */ wait_queue_head_t close_wait; /* Close waiters */ + wait_queue_head_t delta_msr_wait; /* Modem status change */ unsigned long flags; /* TTY flags ASY_*/ struct mutex mutex; /* Locking */ unsigned char *xmit_buf; /* Optional buffer */ |