Skip to content

Commit

Permalink
[media] v4l: Don't compile v4l2-int-device unless really needed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sakari Ailus authored and Mauro Carvalho Chehab committed Jan 6, 2013
1 parent 5e8d02b commit 668a8b3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/media/i2c/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions drivers/media/v4l2-core/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

3 changes: 2 additions & 1 deletion drivers/media/v4l2-core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 668a8b3

Please sign in to comment.