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

[pandora-kernel.git] / drivers / video / au1200fb.c

diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 4ea187d..5dff32a 100644 (file)
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1572,7 +1572,7 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
        /* Copy monitor specs from panel data */
        /* fixme: we're setting up LCD controller windows, so these dont give a
        damn as to what the monitor specs are (the panel itself does, but that
-       isnt done here...so maybe need a generic catchall monitor setting??? */
+       isn't done here...so maybe need a generic catchall monitor setting??? */
        memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs));
 
        /* We first try the user mode passed in argument. If that failed,