diff -urN RC14-rc3-git4-sata_promise/drivers/scsi/sata_sil.c RC14-rc3-git4-sata_sil/drivers/scsi/sata_sil.c --- RC14-rc3-git4-sata_promise/drivers/scsi/sata_sil.c 2005-09-06 17:40:59.000000000 -0400 +++ RC14-rc3-git4-sata_sil/drivers/scsi/sata_sil.c 2005-10-04 15:14:27.000000000 -0400 @@ -289,7 +289,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) { - void *mmio = (void *) sil_scr_addr(ap, sc_reg); + void __iomem *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); if (mmio) return readl(mmio); return 0xffffffffU; @@ -297,7 +297,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) { - void *mmio = (void *) sil_scr_addr(ap, sc_reg); + void *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); if (mmio) writel(val, mmio); }