From a1b6debd1a9a1f3a9057f786e8247b0ebbc65b75 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 14 Nov 2007 15:59:43 -0800
Subject: [PATCH] --- yaml --- r: 73791 b: refs/heads/master c:
 66ba886254edbbd9442d30f1eef6f6fb0145027d h: refs/heads/master i:   73789:
 a90db7ffd1b0706ccb06727f377ad99e6029d262   73787:
 ef1586a5f97b89d71e5ffe631083653fa7d70ce2   73783:
 ebcafc03b3ed515c1f4c92f2b90e790b82e4738e   73775:
 9aeb37f5e6d9b0eeeacbfde6f5a6833b2d1f2831   73759:
 4a1ff17fbfb884b9c422e3e77f97987e96a3bd60   73727:
 03c81e481aebeb7c37917aa61d2ce8bd59d4dfcc v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/isdn/sc/shmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de6f1f401a94..3d843082398c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 186fd777a8c63c28acdbcb0e9aefa7ebc858641e
+refs/heads/master: 66ba886254edbbd9442d30f1eef6f6fb0145027d
diff --git a/trunk/drivers/isdn/sc/shmem.c b/trunk/drivers/isdn/sc/shmem.c
index e0331e0094f1..712220cef139 100644
--- a/trunk/drivers/isdn/sc/shmem.c
+++ b/trunk/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);