summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-11-14 15:59:43 -0800
committerDavid S. Miller <davem@davemloft.net>2007-11-14 15:59:43 -0800
commit66ba886254edbbd9442d30f1eef6f6fb0145027d (patch)
tree007b46bf1924b6aeda1a820ea30b9147935b5dab
parent186fd777a8c63c28acdbcb0e9aefa7ebc858641e (diff)
downloadblackbird-op-linux-66ba886254edbbd9442d30f1eef6f6fb0145027d.tar.gz
blackbird-op-linux-66ba886254edbbd9442d30f1eef6f6fb0145027d.zip
[ISDN] sc: Really, really fix warning
CC [M] drivers/isdn/sc/shmem.o drivers/isdn/sc/shmem.c: In function ‘memcpy_toshmem’: drivers/isdn/sc/shmem.c:53: warning: passing argument 1 of ‘memcpy_toio’ makes pointer from integer without a cast Commit 9317d4313e0cd51b2256ea9a9316f2d8561e37a8: ISDN/sc: fix longstanding warning claimed to fix it, but it didn't. [ Changed the "void *" to be "void __iomem *" -DaveM ] Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by:Karsten Keil <kkeilæsuse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/isdn/sc/shmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c
index e0331e0094f1..712220cef139 100644
--- a/drivers/isdn/sc/shmem.c
+++ b/drivers/isdn/sc/shmem.c
@@ -50,7 +50,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n)
outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80,
sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);
- memcpy_toio(sc_adapter[card]->rambase + dest_rem, src, n);
+ memcpy_toio((void __iomem *)(sc_adapter[card]->rambase + dest_rem), src, n);
spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,
((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);
OpenPOWER on IntegriCloud