summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2005-11-13 16:08:12 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:21 -0800
commitf5f4917c92a9a3814eda9c947fda8afabbd1812d (patch)
tree73dcf87719320a4e1bd87146241f69718181aa6b
parent60f6c464d14b177778334344c86f15616899735a (diff)
downloadop-kernel-dev-f5f4917c92a9a3814eda9c947fda8afabbd1812d.zip
op-kernel-dev-f5f4917c92a9a3814eda9c947fda8afabbd1812d.tar.gz
[PATCH] make vesafb build without CONFIG_MTRR
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>
-rw-r--r--drivers/video/vesafb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 2c3aa2f..3e58ddc 100644
--- 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;
OpenPOWER on IntegriCloud