mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
[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>
This commit is contained in:
parent
60f6c464d1
commit
f5f4917c92
1 changed files with 2 additions and 0 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue