Merge 3.0-rc2 + Linus's latest into usb-linus

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

diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index d8b12c3..c8be8af 100644 (file)
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -1306,7 +1306,7 @@ static void w100_init_lcd(struct w100fb_par *par)
        union graphic_v_disp_u graphic_v_disp;
        union crtc_total_u crtc_total;
 
-       /* w3200 doesnt like undefined bits being set so zero register values first */
+       /* w3200 doesn't like undefined bits being set so zero register values first */
 
        active_h_disp.val = 0;
        active_h_disp.f.active_h_start=mode->left_margin;