projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60f6c46
)
[PATCH] make vesafb build without CONFIG_MTRR
author
Jan Beulich
<jbeulich@novell.com>
Mon, 14 Nov 2005 00:08:12 +0000
(16:08 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:14:21 +0000
(18:14 -0800)
vesafb did not build without CONFIG_MTRR.
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/video/vesafb.c
patch
|
blob
|
history
diff --git
a/drivers/video/vesafb.c
b/drivers/video/vesafb.c
index 2c3aa2fcfd917e5098c465ab97836ba90037c3a5..3e58ddc2bc3829de17a73ddb496ad67ac7624534 100644
(file)
--- a/
drivers/video/vesafb.c
+++ b/
drivers/video/vesafb.c
@@
-413,6
+413,7
@@
static int __init vesafb_probe(struct platform_device *dev)
* region already (FIXME) */
request_region(0x3c0, 32, "vesafb");
+#ifdef CONFIG_MTRR
if (mtrr) {
unsigned int temp_size = size_total;
unsigned int type = 0;
@@
-450,6
+451,7
@@
static int __init vesafb_probe(struct platform_device *dev)
} while (temp_size >= PAGE_SIZE && rc == -EINVAL);
}
}
+#endif
info->fbops = &vesafb_ops;
info->var = vesafb_defined;