[PATCH] allow vesafb to build when no CONFIG_MTRR

[Jan Beulich]

(Note: Patch also attached because the inline version is certain to get
line wrapped.)

vesafb didn't build when CONFIG_MTRR wasn't set.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- /home/jbeulich/tmp/linux-2.6.12/drivers/video/vesafb.c	2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/video/vesafb.c	2005-06-21 09:56:14.572032960 +0200
@@ -45,7 +45,9 @@ static struct fb_fix_screeninfo vesafb_f
 };
 
 static int             inverse   = 0;
+#ifdef CONFIG_MTRR
 static int             mtrr      = 1;
+#endif
 static int	       vram_remap __initdata = 0; /* Set amount of memory to be used */
 static int	       vram_total __initdata = 0; /* Set total amount of memory */
 static int             pmi_setpal = 0;	/* pmi for palette changes ??? */
@@ -204,10 +206,12 @@ static int __init vesafb_setup(char *opt
 			pmi_setpal=0;
 		else if (! strcmp(this_opt, "pmipal"))
 			pmi_setpal=1;
+#ifdef CONFIG_MTRR
 		else if (! strcmp(this_opt, "mtrr"))
 			mtrr=1;
 		else if (! strcmp(this_opt, "nomtrr"))
 			mtrr=0;
+#endif
 		else if (! strncmp(this_opt, "vtotal:", 7))
 			vram_total = simple_strtoul(this_opt+7, NULL, 0);
 		else if (! strncmp(this_opt, "vremap:", 7))
@@ -385,8 +389,9 @@ static int __init vesafb_probe(struct de
 	 * region already (FIXME) */
 	request_region(0x3c0, 32, "vesafb");
 
+#ifdef CONFIG_MTRR
 	if (mtrr) {
-		int temp_size = size_total;
+		unsigned int temp_size = size_total;
 		/* Find the largest power-of-two */
 		while (temp_size & (temp_size - 1))
                 	temp_size &= (temp_size - 1);
@@ -396,6 +401,7 @@ static int __init vesafb_probe(struct de
 			temp_size >>= 1;
 		}
 	}
+#endif
 	
 	info->fbops = &vesafb_ops;
 	info->var = vesafb_defined;

Attachment: linux-2.6.12-vesafb-no-mtrr.patch
Description: Binary data