lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] make vesafb build without CONFIG_MTRR

Browse Source 
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>
This commit is contained in:
Jan Beulich
2005-11-13 16:08:12 -08:00
committed by Linus Torvalds
parent 60f6c464d1
commit f5f4917c92
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/vesafb.c
View File

@@ -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)
} 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;