diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/video/fbmon.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/video/fbmon.c')
| -rw-r--r-- | drivers/video/fbmon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 6cd1976548d4..c2718bb94949 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c | |||
| @@ -1241,6 +1241,8 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info) | |||
| 1241 | vtotal *= 2; | 1241 | vtotal *= 2; |
| 1242 | 1242 | ||
| 1243 | hfreq = pixclock/htotal; | 1243 | hfreq = pixclock/htotal; |
| 1244 | hfreq = (hfreq + 500) / 1000 * 1000; | ||
| 1245 | |||
| 1244 | vfreq = hfreq/vtotal; | 1246 | vfreq = hfreq/vtotal; |
| 1245 | 1247 | ||
| 1246 | return (vfreq < vfmin || vfreq > vfmax || | 1248 | return (vfreq < vfmin || vfreq > vfmax || |