[media] v4l: Don't compile v4l2-int-device unless really needed

Add a configuration option for v4l2-int-device so it is only compiled when
necessary, which is only by omap24xxcam and tcm825x drivers.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 24d78e28e493f38049ab7adcf78ae504d8236f3e..1e4b2d0f23ce38b5fa49970d96519f92281d262c 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -477,7 +477,7 @@ config VIDEO_MT9V032
 
 config VIDEO_TCM825X
        tristate "TCM825x camera sensor support"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_INT_DEVICE
        depends on MEDIA_CAMERA_SUPPORT
        ---help---
          This is a driver for the Toshiba TCM825x VGA camera sensor.

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c071b079de23581ce9e3d973223e564d24b93a74..2433e2bbeee452607e25a3aa3a590506a429706f 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -92,7 +92,7 @@ config VIDEO_M32R_AR_M64278
 
 config VIDEO_OMAP2
        tristate "OMAP2 Camera Capture Interface driver"
-       depends on VIDEO_DEV && ARCH_OMAP2
+       depends on VIDEO_DEV && ARCH_OMAP2 && VIDEO_V4L2_INT_DEVICE
        select VIDEOBUF_DMA_SG
        ---help---
          This is a v4l2 driver for the TI OMAP2 camera capture interface

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.
+

diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index c2d61d4f03d117b5b89107f5411e2693dbe68993..a9d355230e8eb2efb52fb3fbdff2a5b8297a7a73 100644 (file)
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -10,7 +10,8 @@ ifeq ($(CONFIG_COMPAT),y)
   videodev-objs += v4l2-compat-ioctl32.o
 endif
 
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o
+obj-$(CONFIG_VIDEO_V4L2_INT_DEVICE) += v4l2-int-device.o
 obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o
 
 obj-$(CONFIG_VIDEO_TUNER) += tuner.o