Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / video / cobalt_lcdfb.c

diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 42fe155aba0e348a409c2aa002735fc382563e53..e02764319ff77e3590b04ec0297651b5672e6258 100644 (file)
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -303,7 +303,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
                return -EBUSY;
        }
 
-       info->screen_size = res->end - res->start + 1;
+       info->screen_size = resource_size(res);
        info->screen_base = ioremap(res->start, info->screen_size);
        info->fbops = &cobalt_lcd_fbops;
        info->fix = cobalt_lcdfb_fix;