diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:43:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:43:40 -0800 |
| commit | f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6 (patch) | |
| tree | 717e9fc0044e9d94dd363670cacc2dff9d5b4407 /drivers/mmc/mmci.h | |
| parent | d354d9afe923eb08f7ee89128b38ddb6415de01d (diff) | |
| parent | f3e2628bed0d5a88ced8239b35f1534557f9631c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/mmci.h')
| -rw-r--r-- | drivers/mmc/mmci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/mmci.h b/drivers/mmc/mmci.h index 4589bbd6819..6d7eadc9a67 100644 --- a/drivers/mmc/mmci.h +++ b/drivers/mmc/mmci.h @@ -172,8 +172,8 @@ static inline char *mmci_kmap_atomic(struct mmci_host *host, unsigned long *flag return kmap_atomic(sg->page, KM_BIO_SRC_IRQ) + sg->offset; } -static inline void mmci_kunmap_atomic(struct mmci_host *host, unsigned long *flags) +static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags) { - kunmap_atomic(host->sg_ptr->page, KM_BIO_SRC_IRQ); + kunmap_atomic(buffer, KM_BIO_SRC_IRQ); local_irq_restore(*flags); } |