Merge branch 'master'

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index ba98a175ee3a..3a056173fb95 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -150,7 +150,7 @@ static Scsi_Host_Template sil_sht = {
         .ordered_flush          = 1,
 };
 
-static struct ata_port_operations sil_ops = {
+static const struct ata_port_operations sil_ops = {
         .port_disable           = ata_port_disable,
         .dev_config             = sil_dev_config,
         .tf_load                = ata_tf_load,
@@ -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);
 }