media: Revert "media: staging/imx: Allow driver to build if COMPILE_TEST is enabled"
authorFabio Estevam <festevam@gmail.com>
Wed, 5 Jun 2019 20:53:33 +0000 (16:53 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 10 Jun 2019 18:53:29 +0000 (14:53 -0400)
Commit 020bc7354a6e ("media: staging/imx: Allow driver to build
if COMPILE_TEST is enabled") incorrectly assumed that the imx media
driver had no build time dependency with IMX_IPUV3_CORE.

Building on x86_64 without IMX_IPUV3_CORE causes lots of build errors
such as:

All these definitions come from the imx ipu3 core driver, so make
sure that imx media depends on IMX_IPUV3_CORE.

This reverts commit 020bc7354a6ebec980e0aedf5bedf57b42f93aca.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/staging/media/imx/Kconfig

index ad3d7df6bb3c1e6d8a4617b947fce0ca65dac6ab..4c726345dc25cbb2e0504d9aff4737ba6d6a5472 100644 (file)
@@ -2,7 +2,7 @@
 config VIDEO_IMX_MEDIA
        tristate "i.MX5/6 V4L2 media core driver"
        depends on ARCH_MXC || COMPILE_TEST
-       depends on MEDIA_CONTROLLER && VIDEO_V4L2 && (IMX_IPUV3_CORE || COMPILE_TEST)
+       depends on MEDIA_CONTROLLER && VIDEO_V4L2 && IMX_IPUV3_CORE
        depends on VIDEO_V4L2_SUBDEV_API
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG