Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux.git] / drivers / video / amifb.c

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 77cb4ffa1fe4f9d04a4b7314e653991b6e88fe57..a6780eecff0e6aefb864c737ad12a2d9ee8e928a 100644 (file)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1181,7 +1181,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
        }
 
        /*
-        * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing
+        * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the following
         * checks failed and smooth scrolling is not possible
         */