VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / video / amifb.c

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f61cd6e..95ea71c 100644 (file)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1309,7 +1309,7 @@ static int amifb_set_par(struct fb_info *info)
                info->fix.ypanstep = 0;
        } else {
                info->fix.ywrapstep = 0;
-               if (par->vmode &= FB_VMODE_SMOOTH_XPAN)
+               if (par->vmode & FB_VMODE_SMOOTH_XPAN)
                        info->fix.xpanstep = 1;
                else
                        info->fix.xpanstep = 16<<maxfmode;
@@ -2351,7 +2351,7 @@ default_chipset:
         */
 
        {
-       u_long tmp = DIVUL(200E9, amiga_eclock);
+       u_long tmp = DIVUL(200000000000ULL, amiga_eclock);
 
        pixclock[TAG_SHRES] = (tmp + 4) / 8;    /* SHRES:  35 ns / 28 MHz */
        pixclock[TAG_HIRES] = (tmp + 2) / 4;    /* HIRES:  70 ns / 14 MHz */