diff options
-rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 2 | ||||
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 23004847bb05..98d4dabb2c10 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
@@ -111,6 +111,8 @@ static inline void dma_free_noncoherent(struct device *dev, size_t size, | |||
111 | 111 | ||
112 | extern int dma_supported(struct device *dev, u64 mask); | 112 | extern int dma_supported(struct device *dev, u64 mask); |
113 | 113 | ||
114 | extern int arm_dma_set_mask(struct device *dev, u64 dma_mask); | ||
115 | |||
114 | /** | 116 | /** |
115 | * arm_dma_alloc - allocate consistent memory for DMA | 117 | * arm_dma_alloc - allocate consistent memory for DMA |
116 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices | 118 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices |
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 58bc3e4d3bd0..5383bc018571 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -124,8 +124,6 @@ static void arm_dma_sync_single_for_device(struct device *dev, | |||
124 | __dma_page_cpu_to_dev(page, offset, size, dir); | 124 | __dma_page_cpu_to_dev(page, offset, size, dir); |
125 | } | 125 | } |
126 | 126 | ||
127 | static int arm_dma_set_mask(struct device *dev, u64 dma_mask); | ||
128 | |||
129 | struct dma_map_ops arm_dma_ops = { | 127 | struct dma_map_ops arm_dma_ops = { |
130 | .alloc = arm_dma_alloc, | 128 | .alloc = arm_dma_alloc, |
131 | .free = arm_dma_free, | 129 | .free = arm_dma_free, |
@@ -971,7 +969,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
971 | } | 969 | } |
972 | EXPORT_SYMBOL(dma_supported); | 970 | EXPORT_SYMBOL(dma_supported); |
973 | 971 | ||
974 | static int arm_dma_set_mask(struct device *dev, u64 dma_mask) | 972 | int arm_dma_set_mask(struct device *dev, u64 dma_mask) |
975 | { | 973 | { |
976 | if (!dev->dma_mask || !dma_supported(dev, dma_mask)) | 974 | if (!dev->dma_mask || !dma_supported(dev, dma_mask)) |
977 | return -EIO; | 975 | return -EIO; |