diff options
| author | Jan Beulich <jbeulich@novell.com> | 2005-11-14 01:08:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 03:14:21 +0100 |
| commit | f5f4917c92a9a3814eda9c947fda8afabbd1812d (patch) | |
| tree | 73dcf87719320a4e1bd87146241f69718181aa6b | |
| parent | [PATCH] v4l: 976: ensure consistent v4l firmware prefixes (diff) | |
| download | linux-f5f4917c92a9a3814eda9c947fda8afabbd1812d.tar.xz linux-f5f4917c92a9a3814eda9c947fda8afabbd1812d.zip | |
[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>
| -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) * 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; |