diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:36 -0700 |
| commit | 7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e (patch) | |
| tree | a13594ddbd91b27c8afa49c1a2c6b4dc8141ae11 /include/asm-sh64/dma-mapping.h | |
| parent | af84b99f22df115e7aec41d5dbe936e163ef4e2e (diff) | |
| parent | 1bb99a649af92e53ed7391afaf6c2d45a6f57b42 (diff) | |
| download | op-kernel-dev-7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e.zip op-kernel-dev-7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Add a sane pm_power_off implementation.
sh64: Use generic BUG_ON()/WARN_ON().
sh64: Trivial build fixes.
sh64: Drop deprecated ISA tuning for legacy toolchains.
Diffstat (limited to 'include/asm-sh64/dma-mapping.h')
| -rw-r--r-- | include/asm-sh64/dma-mapping.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h index a74a49e..68e27a8 100644 --- a/include/asm-sh64/dma-mapping.h +++ b/include/asm-sh64/dma-mapping.h @@ -126,22 +126,30 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir) - __attribute__ ((alias("dma_sync_single"))); +{ + dma_sync_single(dev, dma_handle, size, dir); +} static inline void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir) - __attribute__ ((alias("dma_sync_single"))); +{ + dma_sync_single(dev, dma_handle, size, dir); +} static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction dir) - __attribute__ ((alias("dma_sync_sg"))); +{ + dma_sync_sg(dev, sg, nelems, dir); +} static inline void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction dir) - __attribute__ ((alias("dma_sync_sg"))); +{ + dma_sync_sg(dev, sg, nelems, dir); +} static inline int dma_get_cache_alignment(void) { |
