diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-08 22:20:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-08 22:20:02 -0800 |
| commit | 775ded5601b2378aa49cf7949b4500526f36fe21 (patch) | |
| tree | 3f839bbb2f8952e5699d33bfb44324eca22e819c /include | |
| parent | 989467d1ea36a753ba358cb4e20a3226b4682282 (diff) | |
| parent | ba1eedb622baaa05fbc514aff50aa7511c89a8cb (diff) | |
Merge bk://bk.arm.linux.org.uk
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 41b764e48f77..a3422e7a903a 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -280,7 +280,7 @@ void uart_write_wakeup(struct uart_port *port); */ void uart_update_timeout(struct uart_port *port, unsigned int cflag, unsigned int quot); -unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios +unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios, struct termios *old, unsigned int min, unsigned int max); unsigned int uart_get_divisor(struct uart_port *port, struct termios *termios, |