diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /arch/powerpc/kernel/dma.c | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'arch/powerpc/kernel/dma.c')
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 355b9d84b0f8..8032b97ccdcb 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <asm/vio.h> | 15 | #include <asm/vio.h> |
| 16 | #include <asm/bug.h> | 16 | #include <asm/bug.h> |
| 17 | #include <asm/abs_addr.h> | ||
| 18 | #include <asm/machdep.h> | 17 | #include <asm/machdep.h> |
| 19 | 18 | ||
| 20 | /* | 19 | /* |
| @@ -50,7 +49,7 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size, | |||
| 50 | return NULL; | 49 | return NULL; |
| 51 | ret = page_address(page); | 50 | ret = page_address(page); |
| 52 | memset(ret, 0, size); | 51 | memset(ret, 0, size); |
| 53 | *dma_handle = virt_to_abs(ret) + get_dma_offset(dev); | 52 | *dma_handle = __pa(ret) + get_dma_offset(dev); |
| 54 | 53 | ||
| 55 | return ret; | 54 | return ret; |
| 56 | #endif | 55 | #endif |