patch-2.2.8 linux/drivers/video/vesafb.c

Next file: linux/fs/adfs/namei.c
Previous file: linux/drivers/video/offb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.7/linux/drivers/video/vesafb.c linux/drivers/video/vesafb.c
@@ -21,7 +21,6 @@
 #include <linux/selection.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/config.h>
 
 #include <asm/io.h>
 #include <asm/mtrr.h>
@@ -635,10 +634,8 @@
 		video_cmap_len = 256;
 	}
 	request_region(0x3c0, 32, "vga+");
-#ifdef CONFIG_MTRR
 	if (mtrr)
 		mtrr_add((unsigned long)video_base, video_size, MTRR_TYPE_WRCOMB, 1);
-#endif
 	
 	strcpy(fb_info.modename, "VESA VGA");
 	fb_info.changevar = NULL;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)