diff --git a/[refs] b/[refs] index 36232d6f31a4..faf1c899c1f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aa76b0ce163f929b4e8f41331073814b0ef8612 +refs/heads/master: 4541dbe154c0703cf47c43389b3544884f5f3522 diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index c6c77562839d..34cf019bba44 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -987,8 +987,8 @@ static int tridentfb_pan_display(struct fb_var_screeninfo *var, unsigned int offset; debug("enter\n"); - offset = (var->xoffset + (var->yoffset * var->xres_virtual)) - * var->bits_per_pixel / 32; + offset = (var->xoffset + (var->yoffset * info->var.xres_virtual)) + * info->var.bits_per_pixel / 32; set_screen_start(par, offset); debug("exit\n"); return 0;