diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /include/asm-ppc/dma-mapping.h | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'include/asm-ppc/dma-mapping.h')
| -rw-r--r-- | include/asm-ppc/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/dma-mapping.h b/include/asm-ppc/dma-mapping.h index 7f0487afebbe..6f74f59938d4 100644 --- a/include/asm-ppc/dma-mapping.h +++ b/include/asm-ppc/dma-mapping.h | |||
| @@ -117,7 +117,7 @@ dma_map_page(struct device *dev, struct page *page, | |||
| 117 | 117 | ||
| 118 | __dma_sync_page(page, offset, size, direction); | 118 | __dma_sync_page(page, offset, size, direction); |
| 119 | 119 | ||
| 120 | return (page - mem_map) * PAGE_SIZE + PCI_DRAM_OFFSET + offset; | 120 | return page_to_bus(page) + offset; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | /* We do nothing. */ | 123 | /* We do nothing. */ |