Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5f4917c authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[PATCH] make vesafb build without CONFIG_MTRR 



vesafb did not build without CONFIG_MTRR.

Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 60f6c464

drivers/video/vesafb.c

+2 −0
Original line number Diff line number Diff line
@@ -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;