diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /drivers/ata/sata_promise.c | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/ata/sata_promise.c')
| -rw-r--r-- | drivers/ata/sata_promise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 1eb0d63c17d5..72eda5160fad 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
| @@ -361,7 +361,7 @@ static void pdc_sata_phy_reset(struct ata_port *ap) | |||
| 361 | static void pdc_pata_cbl_detect(struct ata_port *ap) | 361 | static void pdc_pata_cbl_detect(struct ata_port *ap) |
| 362 | { | 362 | { |
| 363 | u8 tmp; | 363 | u8 tmp; |
| 364 | void __iomem *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; | 364 | void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; |
| 365 | 365 | ||
| 366 | tmp = readb(mmio); | 366 | tmp = readb(mmio); |
| 367 | 367 | ||