diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /include/asm-sh/dma-mapping.h | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-sh/dma-mapping.h')
| -rw-r--r-- | include/asm-sh/dma-mapping.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h index d3fa5c2b889d..48f1f42c5d14 100644 --- a/include/asm-sh/dma-mapping.h +++ b/include/asm-sh/dma-mapping.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 6 | #include <asm/scatterlist.h> | 6 | #include <asm/scatterlist.h> |
| 7 | #include <asm/cacheflush.h> | ||
| 7 | #include <asm/io.h> | 8 | #include <asm/io.h> |
| 8 | 9 | ||
| 9 | extern struct bus_type pci_bus_type; | 10 | extern struct bus_type pci_bus_type; |
| @@ -141,24 +142,24 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, | |||
| 141 | } | 142 | } |
| 142 | } | 143 | } |
| 143 | 144 | ||
| 144 | static inline void dma_sync_single_for_cpu(struct device *dev, | 145 | static void dma_sync_single_for_cpu(struct device *dev, |
| 145 | dma_addr_t dma_handle, size_t size, | 146 | dma_addr_t dma_handle, size_t size, |
| 146 | enum dma_data_direction dir) | 147 | enum dma_data_direction dir) |
| 147 | __attribute__ ((alias("dma_sync_single"))); | 148 | __attribute__ ((alias("dma_sync_single"))); |
| 148 | 149 | ||
| 149 | static inline void dma_sync_single_for_device(struct device *dev, | 150 | static void dma_sync_single_for_device(struct device *dev, |
| 150 | dma_addr_t dma_handle, size_t size, | 151 | dma_addr_t dma_handle, size_t size, |
| 151 | enum dma_data_direction dir) | 152 | enum dma_data_direction dir) |
| 152 | __attribute__ ((alias("dma_sync_single"))); | 153 | __attribute__ ((alias("dma_sync_single"))); |
| 153 | 154 | ||
| 154 | static inline void dma_sync_sg_for_cpu(struct device *dev, | 155 | static void dma_sync_sg_for_cpu(struct device *dev, |
| 155 | struct scatterlist *sg, int nelems, | 156 | struct scatterlist *sg, int nelems, |
| 156 | enum dma_data_direction dir) | 157 | enum dma_data_direction dir) |
| 157 | __attribute__ ((alias("dma_sync_sg"))); | 158 | __attribute__ ((alias("dma_sync_sg"))); |
| 158 | 159 | ||
| 159 | static inline void dma_sync_sg_for_device(struct device *dev, | 160 | static void dma_sync_sg_for_device(struct device *dev, |
| 160 | struct scatterlist *sg, int nelems, | 161 | struct scatterlist *sg, int nelems, |
| 161 | enum dma_data_direction dir) | 162 | enum dma_data_direction dir) |
| 162 | __attribute__ ((alias("dma_sync_sg"))); | 163 | __attribute__ ((alias("dma_sync_sg"))); |
| 163 | 164 | ||
| 164 | static inline int dma_get_cache_alignment(void) | 165 | static inline int dma_get_cache_alignment(void) |