Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-serial
+8
-2
+6
drivers/serial/8250.c
+6
drivers/serial/8250.c
···
2326
2326
.cons = SERIAL8250_CONSOLE,
2327
2327
};
2328
2328
2329
+
/*
2330
+
* early_serial_setup - early registration for 8250 ports
2331
+
*
2332
+
* Setup an 8250 port structure prior to console initialisation. Use
2333
+
* after console initialisation will cause undefined behaviour.
2334
+
*/
2329
2335
int __init early_serial_setup(struct uart_port *port)
2330
2336
{
2331
2337
if (port->line >= ARRAY_SIZE(serial8250_ports))
+2
-2
include/linux/serial_reg.h
+2
-2
include/linux/serial_reg.h
···
247
247
#define UART_CTR 0xFF
248
248
249
249
/*
250
-
* The 16C950 Additional Control Reigster
250
+
* The 16C950 Additional Control Register
251
251
*/
252
252
#define UART_ACR_RXDIS 0x01 /* Receiver disable */
253
-
#define UART_ACR_TXDIS 0x02 /* Receiver disable */
253
+
#define UART_ACR_TXDIS 0x02 /* Transmitter disable */
254
254
#define UART_ACR_DSRFC 0x04 /* DSR Flow Control */
255
255
#define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */
256
256
#define UART_ACR_ICRRD 0x40 /* ICR Read enable */