---

yaml --- r: 14118 b: refs/heads/master c: f5f4917 h: refs/heads/master v: v3
git-mirror · Nov 14, 2005 · 198c950 · 198c950
1 parent 48d5fc0
commit 198c950
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60f6c464d14b177778334344c86f15616899735a
+refs/heads/master: f5f4917c92a9a3814eda9c947fda8afabbd1812d
diff --git a/trunk/drivers/video/vesafb.c b/trunk/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;