diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2006-12-13 03:35:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:55 -0500 |
commit | 3161986224a3faa8ccca3e665b7404d81e7ee3cf (patch) | |
tree | c80817e5867bd75d0bb0e080483bf2a24d5e0633 | |
parent | f13c152684a7f99ead26525270ed3e28a1d2467f (diff) |
[PATCH] fbdev: remove references to non-existent fbmon_valid_timings()
Remove references to non-existent fbmon_valid_timings()
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/amifb.c | 8 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 | ||||
-rw-r--r-- | include/linux/fb.h | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 88a47845c4f7..1a849b870bcc 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -2906,14 +2906,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, | |||
2906 | par->crsr.spot_x = par->crsr.spot_y = 0; | 2906 | par->crsr.spot_x = par->crsr.spot_y = 0; |
2907 | par->crsr.height = par->crsr.width = 0; | 2907 | par->crsr.height = par->crsr.width = 0; |
2908 | 2908 | ||
2909 | #if 0 /* fbmon not done. uncomment for 2.5.x -brad */ | ||
2910 | if (!fbmon_valid_timings(pixclock[clk_shift], htotal, vtotal, | ||
2911 | &fb_info)) { | ||
2912 | DPRINTK("mode doesn't fit for monitor\n"); | ||
2913 | return -EINVAL; | ||
2914 | } | ||
2915 | #endif | ||
2916 | |||
2917 | return 0; | 2909 | return 0; |
2918 | } | 2910 | } |
2919 | 2911 | ||
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 176f9b85cdbe..09684d7a7ce9 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -1488,10 +1488,6 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) | |||
1488 | else | 1488 | else |
1489 | info->var.accel_flags = 0; | 1489 | info->var.accel_flags = 0; |
1490 | 1490 | ||
1491 | #if 0 /* fbmon is not done. uncomment for 2.5.x -brad */ | ||
1492 | if (!fbmon_valid_timings(pixclock, htotal, vtotal, info)) | ||
1493 | return -EINVAL; | ||
1494 | #endif | ||
1495 | aty_crtc_to_var(&crtc, var); | 1491 | aty_crtc_to_var(&crtc, var); |
1496 | var->pixclock = par->pll_ops->pll_to_var(info, &pll); | 1492 | var->pixclock = par->pll_ops->pll_to_var(info, &pll); |
1497 | return 0; | 1493 | return 0; |
diff --git a/include/linux/fb.h b/include/linux/fb.h index 6fe56aaa6685..64177ec9a019 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -929,8 +929,6 @@ extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max) | |||
929 | #define FB_MODE_IS_FIRST 16 | 929 | #define FB_MODE_IS_FIRST 16 |
930 | #define FB_MODE_IS_FROM_VAR 32 | 930 | #define FB_MODE_IS_FROM_VAR 32 |
931 | 931 | ||
932 | extern int fbmon_valid_timings(u_int pixclock, u_int htotal, u_int vtotal, | ||
933 | const struct fb_info *fb_info); | ||
934 | extern int fbmon_dpms(const struct fb_info *fb_info); | 932 | extern int fbmon_dpms(const struct fb_info *fb_info); |
935 | extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, | 933 | extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, |
936 | struct fb_info *info); | 934 | struct fb_info *info); |