git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
powerpc: rename dma_direct_ to dma_nommu_
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
sysdev
/
fsl_pci.c
diff --git
a/arch/powerpc/sysdev/fsl_pci.c
b/arch/powerpc/sysdev/fsl_pci.c
index 22d98057f773bf5837ef26a51fb9ea2427006dae..e4d0133bbeeb1cbbcc5ceb2a3669c5d325765ee0 100644
(file)
--- a/
arch/powerpc/sysdev/fsl_pci.c
+++ b/
arch/powerpc/sysdev/fsl_pci.c
@@
-135,7
+135,7
@@
static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask)
* mapping that allows addressing any RAM address from across PCI.
*/
if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) {
- set_dma_ops(dev, &dma_
direct
_ops);
+ set_dma_ops(dev, &dma_
nommu
_ops);
set_dma_offset(dev, pci64_dma_offset);
}