diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 16:01:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 16:01:07 -0800 |
| commit | 5c1ca65c93503b2c94359ba39640f9687bd192a3 (patch) | |
| tree | 74dfbe4da8d39e302ae343379e20585ffee4b940 | |
| parent | c946160e601c70a0ae0aa807461dd0232bcaf3a7 (diff) | |
| parent | d856c66618f953fc3cd1e613226d5f098ad322c8 (diff) | |
| download | talos-op-linux-5c1ca65c93503b2c94359ba39640f9687bd192a3.tar.gz talos-op-linux-5c1ca65c93503b2c94359ba39640f9687bd192a3.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/8250.c | 6 | ||||
| -rw-r--r-- | include/linux/serial_reg.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 244e8ff11977..7aca22c9976d 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -2326,6 +2326,12 @@ static struct uart_driver serial8250_reg = { .cons = SERIAL8250_CONSOLE, }; +/* + * early_serial_setup - early registration for 8250 ports + * + * Setup an 8250 port structure prior to console initialisation. Use + * after console initialisation will cause undefined behaviour. + */ int __init early_serial_setup(struct uart_port *port) { if (port->line >= ARRAY_SIZE(serial8250_ports)) diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 6a2bb955844b..3c8a6aa77415 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -247,10 +247,10 @@ #define UART_CTR 0xFF /* - * The 16C950 Additional Control Reigster + * The 16C950 Additional Control Register */ #define UART_ACR_RXDIS 0x01 /* Receiver disable */ -#define UART_ACR_TXDIS 0x02 /* Receiver disable */ +#define UART_ACR_TXDIS 0x02 /* Transmitter disable */ #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ |
