[PATCH 1/2] [media] VIDEO_MEDIATEK_VCODEC should depend on HAS_DMA

From: Geert Uytterhoeven
Date: Wed Aug 03 2016 - 14:23:09 EST


If NO_DMA=y:

warning: (VIDEO_MEDIATEK_VCODEC && VIDEO_DM365_VPFE && VIDEO_OMAP4) selects VIDEOBUF2_DMA_CONTIG which has unmet direct dependencies (MEDIA_SUPPORT && HAS_DMA)

drivers/media/v4l2-core/videobuf2-dma-contig.c: In function âvb2_dc_get_userptrâ:
drivers/media/v4l2-core/videobuf2-dma-contig.c:486: error: implicit declaration of function âdma_get_cache_alignmentâ

VIDEO_MEDIATEK_VCODEC selects VIDEOBUF2_DMA_CONTIG, which bypasses its
dependency on HAS_DMA. Make VIDEO_MEDIATEK_VCODEC depend on HAS_DMA to
fix this.

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
drivers/media/platform/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f25344bc79126e2f..552b635cfce7f02b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -169,7 +169,7 @@ config VIDEO_MEDIATEK_VPU
config VIDEO_MEDIATEK_VCODEC
tristate "Mediatek Video Codec driver"
depends on MTK_IOMMU || COMPILE_TEST
- depends on VIDEO_DEV && VIDEO_V4L2
+ depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
depends on ARCH_MEDIATEK || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
--
1.9.1