From 0961feefe068eeddefbb728056e0aaa157ff8ed5 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 23 Apr 2018 21:08:46 +0200 Subject: [PATCH] drivers: media: platform: make VIDEO_VIU depend on I2C MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 7378f1149884 ("media: omap2: omapfb: allow building it with COMPILE_TEST") broke compilation without CONFIG_I2C selected. drivers/media/platform/fsl-viu.c: In function ‘viu_of_probe’: drivers/media/platform/fsl-viu.c:1452:7: error: implicit declaration of function ‘i2c_get_adapter’; did you mean ‘i2c_lock_adapter’? [-Werror=implicit-function-declaration] ad = i2c_get_adapter(0); ^~~~~~~~~~~~~~~ i2c_lock_adapter drivers/media/platform/fsl-viu.c:1452:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion] ad = i2c_get_adapter(0); ^ drivers/media/platform/fsl-viu.c:1534:2: error: implicit declaration of function ‘i2c_put_adapter’; did you mean ‘i2c_lock_adapter’? [-Werror=implicit-function-declaration] i2c_put_adapter(ad); ^~~~~~~~~~~~~~~ i2c_lock_adapter Added I2C dependency in order to make all configurations work again. i2c_get_adapter() has no inline stub, and that could be added as an alternative. Signed-off-by: Anders Roxell --- 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 91b0c7324afb..56c205b44ee1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -42,7 +42,7 @@ config VIDEO_SH_VOU config VIDEO_VIU tristate "Freescale VIU Video Driver" - depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) + depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C select VIDEOBUF_DMA_CONTIG default y ---help--- -- 2.17.0