fix compile error caused by arm-dma-mappingh.patch From: Dan Williams include/asm/dma-mapping.h:352: error: conflicting types for 'dma_sync_single_for_cpu' include/asm/dma-mapping.h:320: error: previous implicit declaration of 'dma_sync_single_for_cpu' was here include/asm/dma-mapping.h:360: error: conflicting types for 'dma_sync_single_for_device' include/asm/dma-mapping.h:329: error: previous implicit declaration of 'dma_sync_single_for_device' was here Signed-off-by: Dan Williams --- include/asm-arm/dma-mapping.h | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index fd827cd..ac19d53 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h @@ -311,24 +311,6 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da #endif #ifndef CONFIG_DMABOUNCE -static inline void -dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, - enum dma_data_direction direction) -{ - /* just sync everything, that's all the pci API can do */ - dma_sync_single_for_cpu(dev, dma_handle, offset+size, direction); -} - -static inline void -dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, - enum dma_data_direction direction) -{ - /* just sync everything, that's all the pci API can do */ - dma_sync_single_for_device(dev, dma_handle, offset+size, direction); -} - /** * dma_sync_single_for_cpu * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices @@ -361,6 +343,24 @@ dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, if (!arch_is_coherent()) consistent_sync((void *)dma_to_virt(dev, handle), size, dir); } + +static inline void +dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single_for_cpu(dev, dma_handle, offset+size, direction); +} + +static inline void +dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single_for_device(dev, dma_handle, offset+size, direction); +} #else extern void dma_sync_single_range_for_cpu(struct device*, dma_addr_t, unsigned long, size_t, enum dma_data_direction); extern void dma_sync_single_range_for_device(struct device*, dma_addr_t, unsigned long, size_t, enum dma_data_direction);