diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-11-26 08:41:48 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-27 06:42:31 -0500 |
commit | c6c22955f80f2db9614b01fe5a3d1cfcd8b3d848 (patch) | |
tree | 3bab9de0cb7d3ce235cb82c495c7c4f9039ca924 /drivers/base/dma-mapping.c | |
parent | cf38f41dee85729002dfcbb2aef4a3ee7776d05b (diff) |
[media] dma-mapping: fix dma_common_get_sgtable() conditional compilation
dma_common_get_sgtable() function doesn't depend on
ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY, so it must not be compiled
conditionally.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/base/dma-mapping.c')
-rw-r--r-- | drivers/base/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 3fbedc75e7c5..0ce39a33b3c2 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c | |||
@@ -218,6 +218,8 @@ void dmam_release_declared_memory(struct device *dev) | |||
218 | } | 218 | } |
219 | EXPORT_SYMBOL(dmam_release_declared_memory); | 219 | EXPORT_SYMBOL(dmam_release_declared_memory); |
220 | 220 | ||
221 | #endif | ||
222 | |||
221 | /* | 223 | /* |
222 | * Create scatter-list for the already allocated DMA buffer. | 224 | * Create scatter-list for the already allocated DMA buffer. |
223 | */ | 225 | */ |
@@ -236,8 +238,6 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, | |||
236 | } | 238 | } |
237 | EXPORT_SYMBOL(dma_common_get_sgtable); | 239 | EXPORT_SYMBOL(dma_common_get_sgtable); |
238 | 240 | ||
239 | #endif | ||
240 | |||
241 | /* | 241 | /* |
242 | * Create userspace mapping for the DMA-coherent memory. | 242 | * Create userspace mapping for the DMA-coherent memory. |
243 | */ | 243 | */ |