From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Mon, 26 Nov 2012 13:41:48 +0000 (-0300)
Subject: [media] dma-mapping: fix dma_common_get_sgtable() conditional compilation
X-Git-Tag: next-20121205~94^2~1^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6c22955f80f2db9614b01fe5a3d1cfcd8b3d848;p=karo-tx-linux.git

[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>
---

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.
  */