]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] dma-mapping: fix dma_common_get_sgtable() conditional compilation
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 26 Nov 2012 13:41:48 +0000 (10:41 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 27 Nov 2012 11:42:31 +0000 (09:42 -0200)
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>
drivers/base/dma-mapping.c

index 3fbedc75e7c56219d1f0eafeabdebe9e058edc27..0ce39a33b3c2c2faf23746f662d609f22c7cf46b 100644 (file)
@@ -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.
  */