projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
include
/
asm-i386
/
dma-mapping.h
diff --git
a/include/asm-i386/dma-mapping.h
b/include/asm-i386/dma-mapping.h
index
81999a3
..
183eebe
100644
(file)
--- a/
include/asm-i386/dma-mapping.h
+++ b/
include/asm-i386/dma-mapping.h
@@
-156,10
+156,10
@@
dma_get_cache_alignment(void)
return (1 << INTERNODE_CACHE_SHIFT);
}
return (1 << INTERNODE_CACHE_SHIFT);
}
-#define dma_is_consistent(d
)
(1)
+#define dma_is_consistent(d
, h)
(1)
static inline void
static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(
struct device *dev,
void *vaddr, size_t size,
enum dma_data_direction direction)
{
flush_write_buffers();
enum dma_data_direction direction)
{
flush_write_buffers();