Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Tue, 24 Feb 2009 23:50:33 +0100
Commit: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 24 Feb 2009 23:50:33 +0100
Revert "fix warning in drivers/isdn/sc/shmem.c"
This reverts commit d03e2aa0661d5778368290e9a4e554bab0f65e86.
Upstream conflict.
---
drivers/isdn/sc/shmem.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c
index fc5b114..712220c 100644
--- a/drivers/isdn/sc/shmem.c
+++ b/drivers/isdn/sc/shmem.c
@@ -54,7 +54,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t 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);
- pr_debug("%s: copying %d bytes from %#lx to %p\n",
+ pr_debug("%s: copying %d bytes from %#lx to %#lx\n",
sc_adapter[card]->devicename, n,
(unsigned long) src,
sc_adapter[card]->rambase + ((unsigned long) dest %0x4000));
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|