History

fbdev: i810: include i810_main.h in i810_dvt.c

Building with W=1 shows that a header needs to be included to make the prototypes visible: drivers/video/fbdev/i810/i810_dvt.c:194:6: error: no previous prototype for 'round_off_xres' [-Werror=missing-prototypes] drivers/video/fbdev/i810/i810_dvt.c:233:6: error: no previous prototype for 'i810fb_encode_registers' [-Werror=missing-prototypes] drivers/video/fbdev/i810/i810_dvt.c:245:6: error: no previous prototype for 'i810fb_fill_var_timings' [-Werror=missing-prototypes] drivers/video/fbdev/i810/i810_dvt.c:279:5: error: no previous prototype for 'i810_get_watermark' [-Werror=missing-prototypes] Adding the header leads to another warning from a mismatched prototype, so fix this as well: drivers/video/fbdev/i810/i810_dvt.c:280:5: error: conflicting types for 'i810_get_watermark'; have 'u32(struct fb_var_screeninfo *,

Arnd Bergmann committed 3 years ago

Commit f6cd4c91 parent 19abb451 file · +2 −1Browse files

Unified · Split

drivers/video/fbdev/i810/i810_dvt.c+2−1
@@ -14,6 +14,7 @@ · 13 unmodified lines
14 14
15#include "i810_regs.h"15#include "i810_regs.h"
16#include "i810.h"16#include "i810.h"
17#include "i810_main.h"
17 18
18struct mode_registers std_modes[] = {19struct mode_registers std_modes[] = {
19 /* 640x480 @ 60Hz */20 /* 640x480 @ 60Hz */
@@ -276,7 +277,7 @@ void i810fb_fill_var_timings(struct fb_var_screeninfo *var) · 256 unmodified lines
276 var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);277 var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);
277}278}
278 279
279u32 i810_get_watermark(struct fb_var_screeninfo *var,280u32 i810_get_watermark(const struct fb_var_screeninfo *var,
280 struct i810fb_par *par)281 struct i810fb_par *par)
281{282{
282 struct mode_registers *params = &par->regs;283 struct mode_registers *params = &par->regs;