diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/tile | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/include/asm/dma-mapping.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h index cf466b39aa13..15e1dceecc64 100644 --- a/arch/tile/include/asm/dma-mapping.h +++ b/arch/tile/include/asm/dma-mapping.h | |||
| @@ -90,13 +90,4 @@ dma_set_mask(struct device *dev, u64 mask) | |||
| 90 | return 0; | 90 | return 0; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | static inline int | ||
| 94 | dma_get_cache_alignment(void) | ||
| 95 | { | ||
| 96 | return L2_CACHE_BYTES; | ||
| 97 | } | ||
| 98 | |||
| 99 | #define dma_is_consistent(d, h) (1) | ||
| 100 | |||
| 101 | |||
| 102 | #endif /* _ASM_TILE_DMA_MAPPING_H */ | 93 | #endif /* _ASM_TILE_DMA_MAPPING_H */ |