summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-05-28 17:57:00 +0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-06-05 15:48:50 +0200
commitfc6c19fb712dea1580f7eb1a7b207522d2cf6f6f (patch)
tree51efafee6d6c9a599212ec3e0723c139a08e49e4 /drivers/media
parentmedia: marvel-ccic: allow ccic and mmp drivers to coexist (diff)
downloadlinux-fc6c19fb712dea1580f7eb1a7b207522d2cf6f6f.tar.xz
linux-fc6c19fb712dea1580f7eb1a7b207522d2cf6f6f.zip
media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG
Testing randconfig builds after the return of the mmp ccic driver shows a link error in some configurations: drivers/media/platform/marvell-ccic/mcam-core.o: In function `mccic_register': mcam-core.c:(.text+0x2e48): undefined reference to `vb2_dma_contig_memops' A closer look at the mcam-core.c file reveals that we need to select both VIDEOBUF2_DMA_CONTIG and VIDEOBUF2_VMALLOC, as already do for VIDEO_CAFE_CCIC. Fixes: 0a9c643c8faa ("media: marvel-ccic: re-enable mmp-driver build") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/marvell-ccic/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig
index 60dbe6d1fae9..cf12e077203a 100644
--- a/drivers/media/platform/marvell-ccic/Kconfig
+++ b/drivers/media/platform/marvell-ccic/Kconfig
@@ -16,6 +16,8 @@ config VIDEO_MMP_CAMERA
depends on ARCH_MMP || COMPILE_TEST
select VIDEO_OV7670
select I2C_GPIO
+ select VIDEOBUF2_VMALLOC
+ select VIDEOBUF2_DMA_CONTIG
select VIDEOBUF2_DMA_SG
---help---
This is a Video4Linux2 driver for the integrated camera