]> git.hungrycats.org Git - linux/commitdiff
[PATCH] a couple of trivial sound/pci iomem annotations
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>
Wed, 2 Feb 2005 05:22:09 +0000 (21:22 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 2 Feb 2005 05:22:09 +0000 (21:22 -0800)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
sound/pci/bt87x.c
sound/pci/mixart/mixart_core.c

index a850d709a11ecaa7e61a57a3bf483949a072cac9..3b7a31f3665b3c8954a779824bd2b1d5c6c766ad 100644 (file)
@@ -162,7 +162,7 @@ struct snd_bt87x {
        snd_card_t *card;
        struct pci_dev *pci;
 
-       void *mmio;
+       void __iomem *mmio;
        int irq;
 
        int dig_rate;
index 60f6b87b756cec5333e7ec88ff091d0fb120bf1c..ba0027f50944fe06ad56ed0288c984c531a06e92 100644 (file)
@@ -95,7 +95,7 @@ static int get_msg(mixart_mgr_t *mgr, mixart_msg_t *resp, u32 msg_frame_address
        }
        size -= MSG_DESCRIPTOR_SIZE;
 
-       memcpy_fromio(resp->data, (void *)MIXART_MEM(mgr, msg_frame_address + MSG_HEADER_SIZE ), size);
+       memcpy_fromio(resp->data, MIXART_MEM(mgr, msg_frame_address + MSG_HEADER_SIZE ), size);
        resp->size = size;
 
        /* swap if necessary */