diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 17:11:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 17:11:03 -0400 |
| commit | 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch) | |
| tree | f68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/isdn/sc/shmem.c | |
| parent | 4638aef40ba9ebb9734caeed1f373c24015259fd (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/isdn/sc/shmem.c')
| -rw-r--r-- | drivers/isdn/sc/shmem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c index 7bc2dfad0775..24854826ca45 100644 --- a/drivers/isdn/sc/shmem.c +++ b/drivers/isdn/sc/shmem.c | |||
| @@ -108,6 +108,7 @@ void memcpy_fromshmem(int card, void *dest, const void *src, size_t n) | |||
| 108 | sc_adapter[card]->rambase + ((unsigned long) src %0x4000), (unsigned long) dest); */ | 108 | sc_adapter[card]->rambase + ((unsigned long) src %0x4000), (unsigned long) dest); */ |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | #if 0 | ||
| 111 | void memset_shmem(int card, void *dest, int c, size_t n) | 112 | void memset_shmem(int card, void *dest, int c, size_t n) |
| 112 | { | 113 | { |
| 113 | unsigned long flags; | 114 | unsigned long flags; |
| @@ -141,3 +142,4 @@ void memset_shmem(int card, void *dest, int c, size_t n) | |||
| 141 | ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); | 142 | ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80); |
| 142 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); | 143 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); |
| 143 | } | 144 | } |
| 145 | #endif /* 0 */ | ||