diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 05:34:41 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 05:34:41 -0400 |
commit | 87b0ef91b6f27c07bf7dcce8584437481f473092 (patch) | |
tree | 6f529ebfe59fc7d0332c31b889f86ac62515a443 /include/asm-sh | |
parent | 19f9a34f87c48bbd270d617d1c986d0c23866a1a (diff) |
sh: dma-mapping compile fixes.
Silly bug, make it build again..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/dma-mapping.h | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h index 124968f9866e..56cd4b977232 100644 --- a/include/asm-sh/dma-mapping.h +++ b/include/asm-sh/dma-mapping.h | |||
@@ -141,25 +141,35 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, | |||
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | static void dma_sync_single_for_cpu(struct device *dev, | 144 | static inline void dma_sync_single_for_cpu(struct device *dev, |
145 | dma_addr_t dma_handle, size_t size, | 145 | dma_addr_t dma_handle, size_t size, |
146 | enum dma_data_direction dir) | 146 | enum dma_data_direction dir) |
147 | __attribute__ ((alias("dma_sync_single"))); | 147 | { |
148 | dma_sync_single(dev, dma_handle, size, dir); | ||
149 | } | ||
150 | |||
151 | static inline void dma_sync_single_for_device(struct device *dev, | ||
152 | dma_addr_t dma_handle, | ||
153 | size_t size, | ||
154 | enum dma_data_direction dir) | ||
155 | { | ||
156 | dma_sync_single(dev, dma_handle, size, dir); | ||
157 | } | ||
148 | 158 | ||
149 | static void dma_sync_single_for_device(struct device *dev, | 159 | static inline void dma_sync_sg_for_cpu(struct device *dev, |
150 | dma_addr_t dma_handle, size_t size, | 160 | struct scatterlist *sg, int nelems, |
151 | enum dma_data_direction dir) | 161 | enum dma_data_direction dir) |
152 | __attribute__ ((alias("dma_sync_single"))); | 162 | { |
163 | dma_sync_sg(dev, sg, nelems, dir); | ||
164 | } | ||
153 | 165 | ||
154 | static void dma_sync_sg_for_cpu(struct device *dev, | 166 | static inline void dma_sync_sg_for_device(struct device *dev, |
155 | struct scatterlist *sg, int nelems, | 167 | struct scatterlist *sg, int nelems, |
156 | enum dma_data_direction dir) | 168 | enum dma_data_direction dir) |
157 | __attribute__ ((alias("dma_sync_sg"))); | 169 | { |
170 | dma_sync_sg(dev, sg, nelems, dir); | ||
171 | } | ||
158 | 172 | ||
159 | static void dma_sync_sg_for_device(struct device *dev, | ||
160 | struct scatterlist *sg, int nelems, | ||
161 | enum dma_data_direction dir) | ||
162 | __attribute__ ((alias("dma_sync_sg"))); | ||
163 | 173 | ||
164 | static inline int dma_get_cache_alignment(void) | 174 | static inline int dma_get_cache_alignment(void) |
165 | { | 175 | { |
@@ -174,6 +184,4 @@ static inline int dma_mapping_error(dma_addr_t dma_addr) | |||
174 | { | 184 | { |
175 | return dma_addr == 0; | 185 | return dma_addr == 0; |
176 | } | 186 | } |
177 | |||
178 | #endif /* __ASM_SH_DMA_MAPPING_H */ | 187 | #endif /* __ASM_SH_DMA_MAPPING_H */ |
179 | |||