diff options
author | Jan Beulich <jbeulich@novell.com> | 2005-11-13 19:08:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:14:21 -0500 |
commit | f5f4917c92a9a3814eda9c947fda8afabbd1812d (patch) | |
tree | 73dcf87719320a4e1bd87146241f69718181aa6b /drivers/video | |
parent | 60f6c464d14b177778334344c86f15616899735a (diff) |
[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>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/vesafb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 2c3aa2fcfd91..3e58ddc2bc38 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c | |||
@@ -413,6 +413,7 @@ static int __init vesafb_probe(struct platform_device *dev) | |||
413 | * region already (FIXME) */ | 413 | * region already (FIXME) */ |
414 | request_region(0x3c0, 32, "vesafb"); | 414 | request_region(0x3c0, 32, "vesafb"); |
415 | 415 | ||
416 | #ifdef CONFIG_MTRR | ||
416 | if (mtrr) { | 417 | if (mtrr) { |
417 | unsigned int temp_size = size_total; | 418 | unsigned int temp_size = size_total; |
418 | unsigned int type = 0; | 419 | unsigned int type = 0; |
@@ -450,6 +451,7 @@ static int __init vesafb_probe(struct platform_device *dev) | |||
450 | } while (temp_size >= PAGE_SIZE && rc == -EINVAL); | 451 | } while (temp_size >= PAGE_SIZE && rc == -EINVAL); |
451 | } | 452 | } |
452 | } | 453 | } |
454 | #endif | ||
453 | 455 | ||
454 | info->fbops = &vesafb_ops; | 456 | info->fbops = &vesafb_ops; |
455 | info->var = vesafb_defined; | 457 | info->var = vesafb_defined; |