Merge branch 'master' into for-next

[mv-sheeva.git] / drivers / serial / cpm_uart / cpm_uart_core.c

diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index cd6cf575902e4aab43a2dc232c7358db93ff8a82..6016179db533dc1b23100d2491a24adaff9bca05 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -852,7 +852,7 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
         */
        cpm_set_smc_fcr(up);
 
-       /* Using idle charater time requires some additional tuning.  */
+       /* Using idle character time requires some additional tuning.  */
        out_be16(&up->smc_mrblr, pinfo->rx_fifosize);
        out_be16(&up->smc_maxidl, pinfo->rx_fifosize);
        out_be16(&up->smc_brklen, 0);