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

• Lines: 19
• Date: Thu Jan 6 10:30:52 2000
• Orig file: v2.3.36/linux/drivers/video/vesafb.c
• Orig date: Mon Oct 11 15:38:15 1999

diff -u --recursive --new-file v2.3.36/linux/drivers/video/vesafb.c linux/drivers/video/vesafb.c
@@ -541,8 +541,7 @@
 	video_visual = (video_bpp == 8) ?
 		FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
 
-	if (!__request_region(&iomem_resource, video_base, video_size,
-			      "vesafb")) {
+	if (!request_mem_region(video_base, video_size, "vesafb")) {
 		printk(KERN_ERR
 		       "vesafb: abort, cannot reserve video memory at 0x%lu\n",
 			video_base);
@@ -647,7 +646,7 @@
 
 	/* request failure does not faze us, as vgacon probably has this
 	 * region already (FIXME) */
-	__request_region(&ioport_resource, 0x3c0, 32, "vesafb");
+	request_region(0x3c0, 32, "vesafb");
 
 	if (mtrr)
 		mtrr_add(video_base, video_size, MTRR_TYPE_WRCOMB, 1);