diff -urN RC14-rc3-git4-ahci/drivers/scsi/sata_nv.c RC14-rc3-git4-sata_nv/drivers/scsi/sata_nv.c
--- RC14-rc3-git4-ahci/drivers/scsi/sata_nv.c	2005-09-26 00:19:12.000000000 -0400
+++ RC14-rc3-git4-sata_nv/drivers/scsi/sata_nv.c	2005-10-04 15:14:15.000000000 -0400
@@ -331,7 +331,7 @@
 		return 0xffffffffU;
 
 	if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)
-		return readl((void*)ap->ioaddr.scr_addr + (sc_reg * 4));
+		return readl((void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4));
 	else
 		return inl(ap->ioaddr.scr_addr + (sc_reg * 4));
 }
@@ -345,7 +345,7 @@
 		return;
 
 	if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)
-		writel(val, (void*)ap->ioaddr.scr_addr + (sc_reg * 4));
+		writel(val, (void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4));
 	else
 		outl(val, ap->ioaddr.scr_addr + (sc_reg * 4));
 }