diff --git a/[refs] b/[refs] index d12d89cd6798..7fc0d3d5009d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ee99f7e2edbd32501cb1fc0b701966d7cbe57e4 +refs/heads/master: 2bdb0278eec7bb466d2b1b31ecf6e48f10b34fbf diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c index 588527a254c2..feea7b1dc386 100644 --- a/trunk/drivers/video/neofb.c +++ b/trunk/drivers/video/neofb.c @@ -1185,8 +1185,8 @@ static int neofb_pan_display(struct fb_var_screeninfo *var, DBG("neofb_update_start"); - Base = (var->yoffset * var->xres_virtual + var->xoffset) >> 2; - Base *= (var->bits_per_pixel + 7) / 8; + Base = (var->yoffset * info->var.xres_virtual + var->xoffset) >> 2; + Base *= (info->var.bits_per_pixel + 7) / 8; neoUnlock();