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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
mm
/
dma-coherent.c
diff --git
a/arch/mips/mm/dma-coherent.c
b/arch/mips/mm/dma-coherent.c
index
97a50d3
..
f6b3c72
100644
(file)
--- a/
arch/mips/mm/dma-coherent.c
+++ b/
arch/mips/mm/dma-coherent.c
@@
-9,16
+9,16
@@
*/
#include <linux/config.h>
#include <linux/types.h>
*/
#include <linux/config.h>
#include <linux/types.h>
+#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
-#include <linux/pci.h>
#include <asm/cache.h>
#include <asm/io.h>
void *dma_alloc_noncoherent(struct device *dev, size_t size,
#include <asm/cache.h>
#include <asm/io.h>
void *dma_alloc_noncoherent(struct device *dev, size_t size,
- dma_addr_t * dma_handle,
in
t gfp)
+ dma_addr_t * dma_handle,
gfp_
t gfp)
{
void *ret;
/* ignore region specifiers */
{
void *ret;
/* ignore region specifiers */
@@
-39,7
+39,7
@@
void *dma_alloc_noncoherent(struct device *dev, size_t size,
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t * dma_handle,
in
t gfp)
+ dma_addr_t * dma_handle,
gfp_
t gfp)
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);