Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / drivers / video / vga16fb.c

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 6c580a02b82917d84ba4361cbb6df1a03451d9b0..9b3c5923365e7dd62e60982f9d6c27341f68cdf5 100644 (file)
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1364,7 +1364,7 @@ static int __init vga16fb_probe(struct platform_device *dev)
        par = info->par;
 
        mutex_init(&par->open_lock);
-       par->isVGA = ORIG_VIDEO_ISVGA;
+       par->isVGA = screen_info.orig_video_isVGA;
        par->palette_blanked = 0;
        par->vesa_blanked = 0;
 
@@ -1378,8 +1378,8 @@ static int __init vga16fb_probe(struct platform_device *dev)
        info->fbops = &vga16fb_ops;
        info->var = vga16fb_defined;
        info->fix = vga16fb_fix;
-       /* supports 8-pixel wide blit rectangles only */
-       info->pixmap.blit_x = 1 << (8 - 1);
+       /* supports rectangles with widths of multiples of 8 */
+       info->pixmap.blit_x = 1 << 7 | 1 << 15 | 1 << 23 | 1 << 31;
        info->flags = FBINFO_FLAG_DEFAULT |
                FBINFO_HWACCEL_YPAN;