Merge remote-tracking branch 'asoc/fix/wm8960' into tmp

[~andy/linux] / drivers / video / via / lcd.c

diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 980ee1b1dcf313b9dc98a6689b7cac48c702d887..5d21ff436ec80a313dc9133a22b1db08ab7006ae 100644 (file)
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -549,7 +549,7 @@ void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres,
        int panel_hres = plvds_setting_info->lcd_panel_hres;
        int panel_vres = plvds_setting_info->lcd_panel_vres;
        u32 clock;
-       struct display_timing timing;
+       struct via_display_timing timing;
        struct fb_var_screeninfo panel_var;
        const struct fb_videomode *mode_crt_table, *panel_crt_table;