diff options
| author | James Bottomley <jejb@raven.il.steeleye.com> | 2002-12-01 03:57:44 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@raven.il.steeleye.com> | 2002-12-01 03:57:44 -0600 |
| commit | fba0a9a313f2d8df4884c2421618f48196c32a6b (patch) | |
| tree | cf1982dd4227c817eb99eef30eab6d773a3cd17f /include/linux | |
| parent | 3e0bb0d1e29ccc655c3a749428c3dbaf087ab8bc (diff) | |
| parent | 493c66851eb42271bdcbb5a092f1402bce146872 (diff) | |
Merge ssh://mulgrave-w/BK/scsi-misc-2.5
into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial.h | 1 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 3 | ||||
| -rw-r--r-- | include/linux/tty.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index d9d93ae8ad3b..b0469a236a13 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -48,6 +48,7 @@ struct serial_struct { unsigned char *iomem_base; unsigned short iomem_reg_shift; unsigned int port_high; + unsigned long iomap_base; /* cookie passed into ioremap */ int reserved[1]; }; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index fe25d0fa6b94..84e021607be9 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -186,6 +186,7 @@ struct uart_port { unsigned int timeout; /* character-based timeout */ unsigned int type; /* port type */ struct uart_ops *ops; + unsigned int custom_divisor; unsigned int line; /* port index */ unsigned long mapbase; /* for ioremap */ unsigned char hub6; /* this should be in the 8250 driver */ @@ -204,8 +205,6 @@ struct uart_state { #define USF_CLOSING_WAIT_INF (0) #define USF_CLOSING_WAIT_NONE (65535) - unsigned int custom_divisor; - int count; struct uart_info *info; struct uart_port *port; diff --git a/include/linux/tty.h b/include/linux/tty.h index 81c8d745f708..11b82d2c98ae 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -397,6 +397,7 @@ extern void do_SAK(struct tty_struct *tty); extern void disassociate_ctty(int priv); extern void tty_flip_buffer_push(struct tty_struct *tty); extern int tty_get_baud_rate(struct tty_struct *tty); +extern int tty_termios_baud_rate(struct termios *termios); /* n_tty.c */ extern struct tty_ldisc tty_ldisc_N_TTY; |