diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2012-11-26 10:41:48 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-27 09:42:31 -0200 |
| commit | c6c22955f80f2db9614b01fe5a3d1cfcd8b3d848 (patch) | |
| tree | 3bab9de0cb7d3ce235cb82c495c7c4f9039ca924 /drivers/base | |
| parent | Revert "videobuf2-dma-contig: Only support if HAVE_GENERIC_DMA_COHERENT" (diff) | |
| download | linux-dev-c6c22955f80f2db9614b01fe5a3d1cfcd8b3d848.tar.xz linux-dev-c6c22955f80f2db9614b01fe5a3d1cfcd8b3d848.zip | |
[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')
| -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) } EXPORT_SYMBOL(dmam_release_declared_memory); +#endif + /* * Create scatter-list for the already allocated DMA buffer. */ @@ -236,8 +238,6 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, } EXPORT_SYMBOL(dma_common_get_sgtable); -#endif - /* * Create userspace mapping for the DMA-coherent memory. */ |