Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=edceec3d6737ae2c901d9abc55f791cf3b42c470
Commit:     edceec3d6737ae2c901d9abc55f791cf3b42c470
Parent:     f0f0d0c691e13a67709ab3b43137ff83210c2c10
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 14 09:19:00 2007 +0000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Mar 14 15:27:50 2007 -0700

    [PATCH] trivial ATA iomem annotations
    
    Signed-off-by: Al Viro <[EMAIL PROTECTED]>
    Acked-by: Jeff Garzik <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/ata/pata_cs5520.c |    2 +-
 drivers/ata/sata_sis.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 7ef8342..55cc293 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -208,7 +208,7 @@ static struct ata_port_operations cs5520_port_ops = {
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct 
pci_device_id *id)
 {
        u8 pcicfg;
-       void *iomap[5];
+       void __iomem *iomap[5];
        static struct ata_probe_ent probe[2];
        int ports = 0;
 
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 1879e0c..a787f0d 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -354,7 +354,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct 
pci_device_id *ent)
                return -ENOMEM;
 
        if (!(probe_ent->port_flags & SIS_FLAG_CFGSCR)) {
-               void *mmio;
+               void __iomem *mmio;
 
                mmio = pcim_iomap(pdev, SIS_SCR_PCI_BAR, 0);
                if (!mmio)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to