Skip to content

Commit

Permalink
[PATCH] make vesafb build without CONFIG_MTRR
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Nov 14, 2005
1 parent 60f6c46 commit f5f4917
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/video/vesafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f5f4917

Please sign in to comment.