Staging: Merge staging-next into Linus's tree

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

diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 9794e0cd3dcc882a04950f75c73596699d501ec6..7e5e5efea4e27659ef564f28652e07377fcf19db 100644 (file)
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -470,7 +470,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
        }
 
        if (port->sc_port.state) {
-               /* The serial_core stuffs are initilized, use them */
+               /* The serial_core stuffs are initialized, use them */
                tty = port->sc_port.state->port.tty;
        }
        else {
@@ -551,11 +551,11 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
        BUG_ON(!port->sc_is_asynch);
 
        if (port->sc_port.state) {
-               /* We're initilized, using serial core infrastructure */
+               /* We're initialized, using serial core infrastructure */
                xmit = &port->sc_port.state->xmit;
        } else {
                /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
-                * initilized yet.  Just return.  Writes are going through
+                * initialized yet.  Just return.  Writes are going through
                 * sn_sal_console_write (due to register_console) at this time.
                 */
                return;