diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-21 21:33:27 -0400 |
| commit | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (patch) | |
| tree | bfe0a664f88b6cb9d284869d615ae2d7fdb7cf63 /drivers/scsi/sata_sil.c | |
| parent | 77501f3cb648e18733509a951ed31eddd7ef2c0b (diff) | |
| parent | 452503f993feffe96e8cc9fbff4888b96e2c5e40 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_sil.c')
| -rw-r--r-- | drivers/scsi/sata_sil.c | 4 |
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 | |||
| 289 | 289 | ||
| 290 | static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) | 290 | static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) |
| 291 | { | 291 | { |
| 292 | void *mmio = (void *) sil_scr_addr(ap, sc_reg); | 292 | void __iomem *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); |
| 293 | if (mmio) | 293 | if (mmio) |
| 294 | return readl(mmio); | 294 | return readl(mmio); |
| 295 | return 0xffffffffU; | 295 | return 0xffffffffU; |
| @@ -297,7 +297,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) | |||
| 297 | 297 | ||
| 298 | static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) | 298 | static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) |
| 299 | { | 299 | { |
| 300 | void *mmio = (void *) sil_scr_addr(ap, sc_reg); | 300 | void *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); |
| 301 | if (mmio) | 301 | if (mmio) |
| 302 | writel(val, mmio); | 302 | writel(val, mmio); |
| 303 | } | 303 | } |