patch-2.4.25 linux-2.4.25/drivers/char/drm-4.0/mga_dma.c

Next file: linux-2.4.25/drivers/char/drm-4.0/mga_drv.c
Previous file: linux-2.4.25/drivers/char/drm-4.0/memory.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/drivers/char/drm-4.0/mga_dma.c linux-2.4.25/drivers/char/drm-4.0/mga_dma.c
@@ -308,7 +308,7 @@
 	temp = ((temp + PAGE_SIZE - 1) / PAGE_SIZE) * PAGE_SIZE;
 
 	dev_priv->ioremap = drm_ioremap(dev->agp->base + offset,
-					temp);
+					temp, dev);
 	if(dev_priv->ioremap == NULL) {
 		DRM_ERROR("Ioremap failed\n");
 		return -ENOMEM;
@@ -635,7 +635,7 @@
 				    dev_priv->primary_size +
 				    PAGE_SIZE - 1) / PAGE_SIZE * PAGE_SIZE;
 
-			drm_ioremapfree((void *) dev_priv->ioremap, temp);
+			drm_ioremapfree((void *) dev_priv->ioremap, temp, dev);
 		}
 	   	if(dev_priv->status_page != NULL) {
 		   	iounmap(dev_priv->status_page);

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