projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'regmap/fix/doc' and 'regmap/fix/mmio' into regmap...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
dma.c
diff --git
a/arch/powerpc/kernel/dma.c
b/arch/powerpc/kernel/dma.c
index
355b9d8
..
8032b97
100644
(file)
--- a/
arch/powerpc/kernel/dma.c
+++ b/
arch/powerpc/kernel/dma.c
@@
-14,7
+14,6
@@
#include <linux/pci.h>
#include <asm/vio.h>
#include <asm/bug.h>
#include <linux/pci.h>
#include <asm/vio.h>
#include <asm/bug.h>
-#include <asm/abs_addr.h>
#include <asm/machdep.h>
/*
#include <asm/machdep.h>
/*
@@
-50,7
+49,7
@@
void *dma_direct_alloc_coherent(struct device *dev, size_t size,
return NULL;
ret = page_address(page);
memset(ret, 0, size);
return NULL;
ret = page_address(page);
memset(ret, 0, size);
- *dma_handle =
virt_to_abs
(ret) + get_dma_offset(dev);
+ *dma_handle =
__pa
(ret) + get_dma_offset(dev);
return ret;
#endif
return ret;
#endif