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

• Lines: 31
• Date: Thu Jan 6 10:30:52 2000
• Orig file: v2.3.36/linux/drivers/video/vga16fb.c
• Orig date: Thu Aug 26 13:05:40 1999

diff -u --recursive --new-file v2.3.36/linux/drivers/video/vga16fb.c linux/drivers/video/vga16fb.c
@@ -924,8 +924,7 @@
 
 	printk(KERN_DEBUG "vga16fb: initializing\n");
 
-	if (!__request_region(&iomem_resource, VGA_FB_PHYS, VGA_FB_PHYS_LEN,
-			      "vga16fb")) {
+	if (!request_mem_region(VGA_FB_PHYS, VGA_FB_PHYS_LEN, "vga16fb")) {
 		printk (KERN_ERR "vga16fb: unable to reserve VGA memory, exiting\n");
 		return -1;
 	}
@@ -951,7 +950,7 @@
 
 	/* note - does not cause failure, b/c vgacon probably still owns this 
 	 * region (FIXME) */
-	if (__request_region(&ioport_resource, 0x3C0, 32, "vga16fb"))
+	if (request_region(0x3C0, 32, "vga16fb"))
 		release_io_ports = 1;
 
 	disp.var = vga16fb_defined;
@@ -994,9 +993,9 @@
 {
     unregister_framebuffer(&vga16fb.fb_info);
     iounmap(vga16fb.video_vbase);
-    __release_region(&iomem_resource, VGA_FB_PHYS, VGA_FB_PHYS_LEN);
+    release_mem_region(VGA_FB_PHYS, VGA_FB_PHYS_LEN);
     if (release_io_ports)
-    	__release_region(&ioport_resource, 0x3c0, 32);
+    	release_region(0x3c0, 32);
 }
 
 #endif