]> git.baikalelectronics.ru Git - kernel.git/commit
[media] media/v4l2: VIDEO_SH_VEU should depend on HAS_DMA
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 18 Aug 2013 11:15:37 +0000 (08:15 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 23 Aug 2013 08:46:08 +0000 (05:46 -0300)
commit29c18f4d1d7503676aa9d3b193dd862bad85ea16
tree873212d257fa4f76d7fd62ed8eb54962782dd869
parentdd9ae578adb0d48d07d35edfd8d93026839bc816
[media] media/v4l2: VIDEO_SH_VEU should depend on HAS_DMA

If NO_DMA=y:
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’
Commit 8e8af2cf024d384602787c8d7c65773ad3b84455 ("[media] media/v4l2:
VIDEOBUF2_DMA_CONTIG should depend on HAS_DMA") added a dependency on
HAS_DMA to VIDEO_SH_VEU, as it selects VIDEOBUF2_DMA_CONTIG.
However, this got lost in the merge conflict resolution in commit
8376c766dd2b47d34a37429398d7f25ee4072ded ("Merge branch 'devel-for-v3.10'
into v4l_for_linus").
Re-add the dependency to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/Kconfig