summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2005-10-21 07:46:02 +0200
committerJeff Garzik2005-10-21 08:05:31 +0200
commit9aa36e89b5677a98d951cf7bef6d99a0f93ea633 (patch)
treed9e663902fbc2f187bfc56ab16080c2b6d573e5f
parent[PATCH] iomem annotations (sata_sx4) (diff)
downloadkernel-qcow2-linux-9aa36e89b5677a98d951cf7bef6d99a0f93ea633.tar.gz
kernel-qcow2-linux-9aa36e89b5677a98d951cf7bef6d99a0f93ea633.tar.xz
kernel-qcow2-linux-9aa36e89b5677a98d951cf7bef6d99a0f93ea633.zip
[PATCH] iomem annotations (sata_sil)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/scsi/sata_sil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index ba98a175ee3a..f6f0184e1ac8 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -289,7 +289,7 @@ static inline unsigned long sil_scr_addr(struct ata_port *ap, unsigned int sc_re
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 u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg)
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);
}