Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / video / mbx / mbxfb.c

diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index cfc6bf3615b59888c9581f3b9f406c75df22c804..a32d1af79e07c4b349e2e88e65d8d9d4cf6bf4ab 100644 (file)
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -255,8 +255,8 @@ static int mbxfb_set_par(struct fb_info *info)
 
        /* setup resolution */
        gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
-       gsctrl |= Gsctrl_Width(info->var.xres - 1) |
-               Gsctrl_Height(info->var.yres - 1);
+       gsctrl |= Gsctrl_Width(info->var.xres) |
+               Gsctrl_Height(info->var.yres);
        writel(gsctrl, GSCTRL);
        udelay(1000);
 
@@ -413,8 +413,8 @@ static void __devinit setup_graphics(struct fb_info *fbi)
 {
        unsigned long gsctrl;
 
-       gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres - 1) |
-               Gsctrl_Height(fbi->var.yres - 1);
+       gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres) |
+               Gsctrl_Height(fbi->var.yres);
        switch (fbi->var.bits_per_pixel) {
        case 16:
                if (fbi->var.green.length == 5)