projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
include
/
asm-cris
/
dma-mapping.h
diff --git
a/include/asm-cris/dma-mapping.h
b/include/asm-cris/dma-mapping.h
index
8eff513
..
662cea7
100644
(file)
--- a/
include/asm-cris/dma-mapping.h
+++ b/
include/asm-cris/dma-mapping.h
@@
-153,13
+153,13
@@
dma_set_mask(struct device *dev, u64 mask)
static inline int
dma_get_cache_alignment(void)
{
static inline int
dma_get_cache_alignment(void)
{
- return (1 <<
L1_CACHE_SHIFT_MAX
);
+ 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)
{
}
enum dma_data_direction direction)
{
}