mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 01:10:28 +00:00
Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
5c1ca65c93
@ -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))
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user