Merge branch 'master' into for-linus

This commit is contained in:
Chris Metcalf 2010-08-13 19:59:15 -04:00
commit 7d72e6fa56
1214 changed files with 45869 additions and 13762 deletions

View file

@ -90,13 +90,4 @@ dma_set_mask(struct device *dev, u64 mask)
return 0;
}
static inline int
dma_get_cache_alignment(void)
{
return L2_CACHE_BYTES;
}
#define dma_is_consistent(d, h) (1)
#endif /* _ASM_TILE_DMA_MAPPING_H */