Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[~andy/linux] / drivers / serial / nwpserial.c

diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 3c02fa96f2825e119526752e9d8e127082cabdac..e65b0d9202a53c43b4f47abbd2fce230c9f9a7f5 100644 (file)
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -81,7 +81,7 @@ nwpserial_console_write(struct console *co, const char *s, unsigned int count)
 
        uart_console_write(&up->port, s, count, nwpserial_console_putchar);
 
-       /* wait for transmitter to become emtpy */
+       /* wait for transmitter to become empty */
        while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0)
                cpu_relax();