Merge remote-tracking branch 'regulator/topic/core' into v3.9-rc8

[~andy/linux] / drivers / media / v4l2-core / Kconfig

diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 65875c3aba1b5e59c2d5df049e0e9defd0543a45..976d029e992530a8412f7e4f8b4ffbf9bac12944 100644 (file)
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -82,3 +82,14 @@ config VIDEOBUF2_DMA_SG
        #depends on HAS_DMA
        select VIDEOBUF2_CORE
        select VIDEOBUF2_MEMOPS
+
+config VIDEO_V4L2_INT_DEVICE
+       tristate "V4L2 int device (DEPRECATED)"
+       depends on VIDEO_V4L2
+       ---help---
+         An early framework for a hardware-independent interface for
+         image sensors and bridges etc. Currently used by omap24xxcam and
+         tcm825x drivers that should be converted to V4L2 subdev.
+
+         Do not use for new developments.
+