Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / video / vesafb.c

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 090aa1a9be6e0d30eac4b580cac27addb0b38d3f..6a069d04791415088f8b14d40f658279815cf721 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/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)