diff --git a/[refs] b/[refs] index 6f5c152c8f8a..cbee272502b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32cf8c1e50ac9d49f348e886c6e664cdc37aaead +refs/heads/master: f845fbac4e68573351965d9aaf626a63cc4151c7 diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c index 55e28ba57b43..e6e56b8df2db 100644 --- a/trunk/drivers/video/vesafb.c +++ b/trunk/drivers/video/vesafb.c @@ -66,15 +66,6 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var, #ifdef __i386__ int offset; - if (!ypan) - return -EINVAL; - if (var->xoffset) - return -EINVAL; - if (var->yoffset > var->yres_virtual) - return -EINVAL; - if ((ypan==1) && var->yoffset+var->yres > var->yres_virtual) - return -EINVAL; - offset = (var->yoffset * info->fix.line_length + var->xoffset) / 4; __asm__ __volatile__(