aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/v4l2-core/videobuf2-dma-contig.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 572945048f79..10beaee7f0ae 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -226,8 +226,6 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
226/* DMABUF ops for exporters */ 226/* DMABUF ops for exporters */
227/*********************************************/ 227/*********************************************/
228 228
229#ifdef HAVE_GENERIC_DMA_COHERENT
230
231struct vb2_dc_attachment { 229struct vb2_dc_attachment {
232 struct sg_table sgt; 230 struct sg_table sgt;
233 enum dma_data_direction dir; 231 enum dma_data_direction dir;
@@ -418,8 +416,6 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv)
418 return dbuf; 416 return dbuf;
419} 417}
420 418
421#endif
422
423/*********************************************/ 419/*********************************************/
424/* callbacks for USERPTR buffers */ 420/* callbacks for USERPTR buffers */
425/*********************************************/ 421/*********************************************/
@@ -739,9 +735,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
739const struct vb2_mem_ops vb2_dma_contig_memops = { 735const struct vb2_mem_ops vb2_dma_contig_memops = {
740 .alloc = vb2_dc_alloc, 736 .alloc = vb2_dc_alloc,
741 .put = vb2_dc_put, 737 .put = vb2_dc_put,
742#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
743 .get_dmabuf = vb2_dc_get_dmabuf, 738 .get_dmabuf = vb2_dc_get_dmabuf,
744#endif
745 .cookie = vb2_dc_cookie, 739 .cookie = vb2_dc_cookie,
746 .vaddr = vb2_dc_vaddr, 740 .vaddr = vb2_dc_vaddr,
747 .mmap = vb2_dc_mmap, 741 .mmap = vb2_dc_mmap,