Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31619862 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] fbdev: remove references to non-existent fbmon_valid_timings() 



Remove references to non-existent fbmon_valid_timings()

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f13c1526

drivers/video/amifb.c

+0 −8
Original line number Diff line number Diff line
@@ -2906,14 +2906,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, 
	par->crsr.spot_x = par->crsr.spot_y = 0;

	par->crsr.height = par->crsr.width = 0;



#if 0	/* fbmon not done.  uncomment for 2.5.x -brad */

	if (!fbmon_valid_timings(pixclock[clk_shift], htotal, vtotal,

				 &fb_info)) {

		DPRINTK("mode doesn't fit for monitor\n");

		return -EINVAL;

	}

#endif



	return 0;

}

drivers/video/aty/atyfb_base.c

+0 −4
Original line number Diff line number Diff line
@@ -1488,10 +1488,6 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 
	else

		info->var.accel_flags = 0;



#if 0 /* fbmon is not done. uncomment for 2.5.x -brad */

	if (!fbmon_valid_timings(pixclock, htotal, vtotal, info))

		return -EINVAL;

#endif

	aty_crtc_to_var(&crtc, var);

	var->pixclock = par->pll_ops->pll_to_var(info, &pll);

	return 0;

include/linux/fb.h

+0 −2
Original line number Diff line number Diff line
@@ -929,8 +929,6 @@ extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max) 
#define FB_MODE_IS_FIRST	16

#define FB_MODE_IS_FROM_VAR     32



extern int fbmon_valid_timings(u_int pixclock, u_int htotal, u_int vtotal,

			       const struct fb_info *fb_info);

extern int fbmon_dpms(const struct fb_info *fb_info);

extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var,

		       struct fb_info *info);