git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
dma.c
diff --git
a/arch/ppc64/kernel/dma.c
b/arch/ppc64/kernel/dma.c
index
dec55ef
..
68d517f
100644
(file)
--- a/
arch/ppc64/kernel/dma.c
+++ b/
arch/ppc64/kernel/dma.c
@@
-43,7
+43,7
@@
void *dma_alloc_coherent(struct device *dev, size_t size,
if (dev->bus == &vio_bus_type)
return vio_alloc_consistent(to_vio_dev(dev), size, dma_handle);
BUG();
- return
0
;
+ return
NULL
;
}
EXPORT_SYMBOL(dma_alloc_coherent);