Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[~andy/linux] / drivers / char / amiserial.c

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index fd3ebd1be570f98062ae3761bf6a51d3b1145427..6c32fbf071648931374bfc6fa699d6ba37a523f1 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -81,6 +81,7 @@ static char *serial_version = "4.30";
 #include <linux/mm.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
 
@@ -779,7 +780,7 @@ static void change_speed(struct async_struct *info,
                info->IER |= UART_IER_MSI;
        }
        /* TBD:
-        * Does clearing IER_MSI imply that we should disbale the VBL interrupt ?
+        * Does clearing IER_MSI imply that we should disable the VBL interrupt ?
         */
 
        /*