From e4a53f6daeceaa31f54b25a6bdb8ad1bf9290ca3 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben@simtec.co.uk>
Date: Tue, 22 Sep 2009 16:47:43 -0700
Subject: [PATCH] --- yaml --- r: 164879 b: refs/heads/master c:
 360fa58828784f307c3977d5ff4c8e400f074a56 h: refs/heads/master i:   164877:
 c65ca778ca2f180d9c9552e74adfd086d09d3151   164875:
 bf74f44e5a25ac156387f27239251c27ceabe7e5   164871:
 01b2ce902066e5a331f4aa2554e0949cc56b4cc5   164863:
 2e05ccbbf71351aebbc2ab5976b95343b41d6c15 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/s3c2410fb.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3fd8190ca47c..a2c090c32bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4a83d2ed83da0c4b45289ca72f10205aa96589
+refs/heads/master: 360fa58828784f307c3977d5ff4c8e400f074a56
diff --git a/trunk/drivers/video/s3c2410fb.c b/trunk/drivers/video/s3c2410fb.c
index 5ffca2adc6a8..aac661225c78 100644
--- a/trunk/drivers/video/s3c2410fb.c
+++ b/trunk/drivers/video/s3c2410fb.c
@@ -369,7 +369,9 @@ static void s3c2410fb_activate_var(struct fb_info *info)
 	void __iomem *regs = fbi->io;
 	int type = fbi->regs.lcdcon1 & S3C2410_LCDCON1_TFT;
 	struct fb_var_screeninfo *var = &info->var;
-	int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock) / 2;
+	int clkdiv;
+
+	clkdiv = DIV_ROUND_UP(s3c2410fb_calc_pixclk(fbi, var->pixclock), 2);
 
 	dprintk("%s: var->xres  = %d\n", __func__, var->xres);
 	dprintk("%s: var->yres  = %d\n", __func__, var->yres);