X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Figafb.c;h=dd6b16c845c2bc4b4598704bb16b702dcddec8c7;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=2da19ea040d0f42d2fd60d5f0c9746763d7dae72;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 2da19ea04..dd6b16c84 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -262,8 +262,8 @@ static int igafb_mmap(struct fb_info *info, struct file *file,
 		pgprot_val(vma->vm_page_prot) &= ~(par->mmap_map[i].prot_mask);
 		pgprot_val(vma->vm_page_prot) |= par->mmap_map[i].prot_flag;
 
-		if (remap_pfn_range(vma, vma->vm_start + page,
-			map_offset >> PAGE_SHIFT, map_size, vma->vm_page_prot))
+		if (remap_page_range(vma, vma->vm_start + page, map_offset,
+				     map_size, vma->vm_page_prot))
 			return -EAGAIN;
 
 		page += map_size;
@@ -531,7 +531,6 @@ int __init igafb_init(void)
 	info->var = default_var;
 	info->fix = igafb_fix;
 	info->pseudo_palette = (void *)(par + 1);
-	info->device = &pdev->dev;
 
 	if (!iga_init(info, par)) {
 		iounmap((void *)par->io_base);