diff -urN RC13-git7-ahci/drivers/scsi/sata_nv.c RC13-git7-sata_nv/drivers/scsi/sata_nv.c
--- RC13-git7-ahci/drivers/scsi/sata_nv.c	2005-09-06 17:40:59.000000000 -0400
+++ RC13-git7-sata_nv/drivers/scsi/sata_nv.c	2005-09-07 13:55:21.000000000 -0400
@@ -329,7 +329,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));
 }
@@ -343,7 +343,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));
 }