summaryrefslogtreecommitdiffstats
path: root/drivers/video/atyfb.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-04-19 04:00:00 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-04-19 04:00:00 +0000
commit46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch)
tree3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/video/atyfb.c
parent31dc59d503a02e84c4de98826452acaeb56dc15a (diff)
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'drivers/video/atyfb.c')
-rw-r--r--drivers/video/atyfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atyfb.c b/drivers/video/atyfb.c
index b2efe721f..cdacf23a4 100644
--- a/drivers/video/atyfb.c
+++ b/drivers/video/atyfb.c
@@ -2539,7 +2539,7 @@ static int atyfb_decode_var(const struct fb_var_screeninfo *var,
else
par->accel_flags = 0;
-#if 0
+#if 0 /* fbmon is not done. uncomment for 2.5.x -brad */
if (!fbmon_valid_timings(var->pixclock, htotal, vtotal, info))
return -EINVAL;
#endif