summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/Kconfig
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-04-23 21:31:39 +0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-05 15:56:43 +0200
commit530d47388496a1d086fd481dbf8fcada6add3be8 (patch)
tree30cbfbcdab212ef2a09e52fa4c8a384dedc49d08 /drivers/media/platform/Kconfig
parentmedia: ngene: fix ci_tsfix modparam description typo (diff)
downloadlinux-530d47388496a1d086fd481dbf8fcada6add3be8.tar.xz
linux-530d47388496a1d086fd481dbf8fcada6add3be8.zip
media: drivers: media: platform: make VIDEO_VIU depend on I2C
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. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/Kconfig')
-rw-r--r--drivers/media/platform/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index e3229f7baed1..5c3ae58cc40c 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---