From 57a56d8f4c59793c638f53798995fd46c12b475a Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 13 Dec 2006 00:35:54 -0800
Subject: [PATCH] --- yaml --- r: 44523 b: refs/heads/master c:
 3161986224a3faa8ccca3e665b7404d81e7ee3cf h: refs/heads/master i:   44521:
 419fe9de4e5c49183b49871107a5f0cd2fe50992   44519:
 4d8bb8e72af750fce6a6a167dc7b719850f6a750 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/amifb.c          | 8 --------
 trunk/drivers/video/aty/atyfb_base.c | 4 ----
 trunk/include/linux/fb.h             | 2 --
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 7416c81d0d1b..fbb2b85970a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f13c152684a7f99ead26525270ed3e28a1d2467f
+refs/heads/master: 3161986224a3faa8ccca3e665b7404d81e7ee3cf
diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c
index 88a47845c4f7..1a849b870bcc 100644
--- a/trunk/drivers/video/amifb.c
+++ b/trunk/drivers/video/amifb.c
@@ -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;
 }
 
diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c
index 176f9b85cdbe..09684d7a7ce9 100644
--- a/trunk/drivers/video/aty/atyfb_base.c
+++ b/trunk/drivers/video/aty/atyfb_base.c
@@ -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;
diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h
index 6fe56aaa6685..64177ec9a019 100644
--- a/trunk/include/linux/fb.h
+++ b/trunk/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)
 #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);