Commit f5f4917c authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds

[PATCH] make vesafb build without CONFIG_MTRR

vesafb did not build without CONFIG_MTRR.

Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 60f6c464
...@@ -413,6 +413,7 @@ static int __init vesafb_probe(struct platform_device *dev) ...@@ -413,6 +413,7 @@ static int __init vesafb_probe(struct platform_device *dev)
* region already (FIXME) */ * region already (FIXME) */
request_region(0x3c0, 32, "vesafb"); request_region(0x3c0, 32, "vesafb");
#ifdef CONFIG_MTRR
if (mtrr) { if (mtrr) {
unsigned int temp_size = size_total; unsigned int temp_size = size_total;
unsigned int type = 0; unsigned int type = 0;
...@@ -450,6 +451,7 @@ static int __init vesafb_probe(struct platform_device *dev) ...@@ -450,6 +451,7 @@ static int __init vesafb_probe(struct platform_device *dev)
} while (temp_size >= PAGE_SIZE && rc == -EINVAL); } while (temp_size >= PAGE_SIZE && rc == -EINVAL);
} }
} }
#endif
info->fbops = &vesafb_ops; info->fbops = &vesafb_ops;
info->var = vesafb_defined; info->var = vesafb_defined;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment