diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
| commit | 9d8f057acbd38d8177cf2ffd5e151d52c2477372 (patch) | |
| tree | 1c3387b045a8a487ff99bf3abed1cdf41670f6e6 /include | |
| parent | 591eb85ecd7e6eb8596c6129ae074e16636b99f4 (diff) | |
| parent | 91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06 (diff) | |
| download | linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.tar.gz linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.tar.bz2 linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Merge avlab serial board entries in parport_serial
[SERIAL] kernel console should send CRLF not LFCR
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 57abcea1cb5d..c32e60e79dea 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -369,6 +369,9 @@ void uart_parse_options(char *options, int *baud, int *parity, int *bits, int uart_set_options(struct uart_port *port, struct console *co, int baud, int parity, int bits, int flow); struct tty_driver *uart_console_device(struct console *co, int *index); +void uart_console_write(struct uart_port *port, const char *s, + unsigned int count, + void (*putchar)(struct uart_port *, int)); /* * Port/driver registration/removal |