Skip to content

Commit

Permalink
[media] dma-mapping: fix dma_common_get_sgtable() conditional compila…
Browse files Browse the repository at this point in the history
…tion

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 <[email protected]>
Signed-off-by: Marek Szyprowski <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
mszyprow authored and Mauro Carvalho Chehab committed Nov 27, 2012
1 parent cf38f41 commit c6c2295
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/base/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -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.
*/
Expand Down

0 comments on commit c6c2295

Please sign in to comment.