From 0818df9b60e21cf0fd129855f6729e8d3b6b0f40 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 6 Feb 2008 01:39:16 -0800 Subject: [PATCH] --- yaml --- r: 83563 b: refs/heads/master c: 2e9750272cd49732293b6fe771ae110be8d87273 h: refs/heads/master i: 83561: 873e7be0d625dc4af74c506aa52057721565c8eb 83559: 5c219d2d6db4f450ab2188431fef706d4c40300a v: v3 --- [refs] | 2 +- trunk/drivers/video/vermilion/vermilion.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a92d5a8f7c0e..7d9216997e7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e9045494aa50f34b774a7449dde4128240a7b00 +refs/heads/master: 2e9750272cd49732293b6fe771ae110be8d87273 diff --git a/trunk/drivers/video/vermilion/vermilion.c b/trunk/drivers/video/vermilion/vermilion.c index 1c656667b937..2aa71eb67c2b 100644 --- a/trunk/drivers/video/vermilion/vermilion.c +++ b/trunk/drivers/video/vermilion/vermilion.c @@ -651,7 +651,7 @@ static int vmlfb_check_var_locked(struct fb_var_screeninfo *var, return -EINVAL; } - pitch = __ALIGN_MASK((var->xres * var->bits_per_pixel) >> 3, 0x3F); + pitch = ALIGN((var->xres * var->bits_per_pixel) >> 3, 0x40); mem = pitch * var->yres_virtual; if (mem > vinfo->vram_contig_size) { return -ENOMEM; @@ -785,8 +785,7 @@ static int vmlfb_set_par_locked(struct vml_info *vinfo) int clock; vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; - vinfo->stride = - __ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F); + vinfo->stride = ALIGN(var->xres_virtual * vinfo->bytes_per_pixel, 0x40); info->fix.line_length = vinfo->stride; if (!subsys)