fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / drivers / video / s3c2410fb.c

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 7da0027..2b094de 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/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);
@@ -1002,12 +1004,12 @@ dealloc_fb:
        return ret;
 }
 
-static int __init s3c2410fb_probe(struct platform_device *pdev)
+static int __devinit s3c2410fb_probe(struct platform_device *pdev)
 {
        return s3c24xxfb_probe(pdev, DRV_S3C2410);
 }
 
-static int __init s3c2412fb_probe(struct platform_device *pdev)
+static int __devinit s3c2412fb_probe(struct platform_device *pdev)
 {
        return s3c24xxfb_probe(pdev, DRV_S3C2412);
 }
@@ -1119,7 +1121,7 @@ int __init s3c2410fb_init(void)
        int ret = platform_driver_register(&s3c2410fb_driver);
 
        if (ret == 0)
-               ret = platform_driver_register(&s3c2412fb_driver);;
+               ret = platform_driver_register(&s3c2412fb_driver);
 
        return ret;
 }