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

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

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 24661cd5e4fbc6048fea6e96ebd945aa0155f90e..768612f8e41e24e304f6a32093ce377b76448695 100644 (file)
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -2649,7 +2649,7 @@ static int __init rs_360_init(void)
                                sup->tfcr = SMC_EB;
 
                                /* Set this to 1 for now, so we get single
-                                * character interrupts.  Using idle charater
+                                * character interrupts.  Using idle character
                                 * time requires some additional tuning.
                                 */
                                sup->mrblr = 1;
@@ -2728,7 +2728,7 @@ static int __init rs_360_init(void)
                                up->tfcr = SMC_EB;
 
                                /* Set this to 1 for now, so we get single
-                                * character interrupts.  Using idle charater
+                                * character interrupts.  Using idle character
                                 * time requires some additional tuning.
                                 */
                                up->mrblr = 1;
@@ -2886,7 +2886,7 @@ int serial_console_setup( struct console *co, char *options)
                sup->tfcr = SMC_EB;
 
                /* Set this to 1 for now, so we get single
-                * character interrupts.  Using idle charater
+                * character interrupts.  Using idle character
                 * time requires some additional tuning.
                 */
                sup->mrblr = 1;