Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / drivers / tty / serial / bfin_uart.c

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 9242d56ba2670d4aebc21749d9003c4d42986a35..9b11c3f23eae98fcfad2c97f9983ef5b91928ac1 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -815,7 +815,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
                lcr = WLS(5);
                break;
        default:
-               printk(KERN_ERR "%s: word lengh not supported\n",
+               printk(KERN_ERR "%s: word length not supported\n",
                        __func__);
        }