diff --git a/[refs] b/[refs] index 8326d4bca417..ae091e0fa51b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbff2168c1088995753e889580c756971eca51e4 +refs/heads/master: 8aed62882129c4e7608deb6fe1a39b44a9aa4539 diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c index 090aa1a9be6e..6a069d047914 100644 --- a/trunk/drivers/video/vesafb.c +++ b/trunk/drivers/video/vesafb.c @@ -253,7 +253,7 @@ static int __init vesafb_probe(struct platform_device *dev) size_vmode = vesafb_defined.yres * vesafb_fix.line_length; /* size_total -- all video memory we have. Used for mtrr - * entries, ressource allocation and bounds + * entries, resource allocation and bounds * checking. */ size_total = screen_info.lfb_size * 65536; if (vram_total)