[PATCH] trivial ATA iomem annotations
authorAl Viro <viro@ftp.linux.org.uk>
Wed, 14 Mar 2007 09:19:00 +0000 (09:19 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:27:50 +0000 (15:27 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/ata/pata_cs5520.c
drivers/ata/sata_sis.c

index 7ef8342..55cc293 100644 (file)
@@ -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;
 
index 1879e0c..a787f0d 100644 (file)
@@ -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)