Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / include / linux / serial_reg.h

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 */