git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index
7d09a09
..
a2e7368
100644
(file)
--- a/
arch/ia64/include/asm/dma-mapping.h
+++ b/
arch/ia64/include/asm/dma-mapping.h
@@
-86,8
+86,6
@@
static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
return daddr;
}
return daddr;
}
-extern int dma_get_cache_alignment(void);
-
static inline void
dma_cache_sync (struct device *dev, void *vaddr, size_t size,
enum dma_data_direction dir)
static inline void
dma_cache_sync (struct device *dev, void *vaddr, size_t size,
enum dma_data_direction dir)
@@
-99,6
+97,4
@@
dma_cache_sync (struct device *dev, void *vaddr, size_t size,
mb();
}
mb();
}
-#define dma_is_consistent(d, h) (1) /* all we do is coherent memory... */
-
#endif /* _ASM_IA64_DMA_MAPPING_H */
#endif /* _ASM_IA64_DMA_MAPPING_H */