Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[mv-sheeva.git] / drivers / staging / comedi / drivers / plx9080.h

diff --git a/drivers/staging/comedi/drivers/plx9080.h b/drivers/staging/comedi/drivers/plx9080.h
index e4bbd5dc9a612c9d0c0ac2be03fb87cc25674ec6..485d63f99293a560bcc3cc0ccc9940df4f8a39ab 100644 (file)
--- a/drivers/staging/comedi/drivers/plx9080.h
+++ b/drivers/staging/comedi/drivers/plx9080.h
@@ -380,9 +380,9 @@ enum bigend_bits {
 #define MBX_ADDR_SPACE_360 0x80        /* wanXL100s/200/400 */
 #define MBX_ADDR_MASK_360 (MBX_ADDR_SPACE_360-1)
 
-static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
+static inline int plx9080_abort_dma(void __iomem *iobase, unsigned int channel)
 {
-       void *dma_cs_addr;
+       void __iomem *dma_cs_addr;
        uint8_t dma_status;
        const int timeout = 10000;
        unsigned int i;
@@ -404,8 +404,8 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
        }
        if (i == timeout) {
                printk
-                       ("plx9080: cancel() timed out waiting for dma %i done clear\n",
-                       channel);
+                   ("plx9080: cancel() timed out waiting for dma %i done clear\n",
+                    channel);
                return -ETIMEDOUT;
        }
        /*  disable and abort channel */
@@ -418,8 +418,8 @@ static inline int plx9080_abort_dma(void *iobase, unsigned int channel)
        }
        if (i == timeout) {
                printk
-                       ("plx9080: cancel() timed out waiting for dma %i done set\n",
-                       channel);
+                   ("plx9080: cancel() timed out waiting for dma %i done set\n",
+                    channel);
                return -ETIMEDOUT;
        }