Merge master.kernel.org:/home/rmk/linux-2.6-serial

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 244e8ff119777d1c9a237ae89209441fd9350c52..7aca22c9976d0f37a9d8f3e0b0cf6a41d6a3d787 100644 (file)
--- 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 6a2bb955844babf72363d839896ed7d49e049a5b..3c8a6aa7741598b431f8bc43cfcb2104de3900b4 100644 (file)
--- 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 */