1. 24 Aug, 2013 39 commits
  2. 23 Aug, 2013 1 commit
    • Geert Uytterhoeven's avatar
      [media] media/v4l2: VIDEO_SH_VEU should depend on HAS_DMA · 976f375d
      Geert Uytterhoeven authored
      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 da508f57 ("[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
      df90e225 ("Merge branch 'devel-for-v3.10'
      into v4l_for_linus").
      Re-add the dependency to fix this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
      976f375d