diff options
| author |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-20 10:32:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-21 07:55:47 -0300 |
| commit | b6334460f2929c02d0d1f0fbad9f909229d00d50 (patch) | |
| tree | 8a33cc158685126328a573c9b4e81d26390d6faa /drivers/media/v4l2-core | |
| parent | [media] Put the test devices together (diff) | |
| download | linux-dev-b6334460f2929c02d0d1f0fbad9f909229d00d50.tar.xz linux-dev-b6334460f2929c02d0d1f0fbad9f909229d00d50.zip | |
[media] Cleanup media Kconfig files
- get rid of ridden V4L2_COMMON symbol
This symbol is not needed anymore; it can be folded with V4L2
one, simplifying the Kconfig a little bit;
- Comment why some Kconfig items are needed;
- Remove if test for MEDIA_CAMERA_SUPPORT, replacing it by
depends on.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/Kconfig | 27 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/Makefile | 2 |
2 files changed, 17 insertions, 12 deletions
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index 05e530c0b012..0c54e19d9944 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -2,6 +2,12 @@ # Generic video config states # +# Enable the V4L2 core and API +config VIDEO_V4L2 + tristate + depends on (I2C || I2C=n) && VIDEO_DEV + default (I2C || I2C=n) && VIDEO_DEV + config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality on V4L2 drivers" default n @@ -19,11 +25,17 @@ config VIDEO_FIXED_MINOR_RANGES When in doubt, say N. -config VIDEO_V4L2 +# Used by drivers that need tuner.ko +config VIDEO_TUNER tristate - depends on VIDEO_V4L2_COMMON - default y + depends on MEDIA_TUNER + +# Used by drivers that need v4l2-mem2mem.ko +config V4L2_MEM2MEM_DEV + tristate + depends on VIDEOBUF2_CORE +# Used by drivers that need Videobuf modules config VIDEOBUF_GEN tristate @@ -45,14 +57,7 @@ config VIDEOBUF_DVB tristate select VIDEOBUF_GEN -config VIDEO_TUNER - tristate - depends on MEDIA_TUNER - -config V4L2_MEM2MEM_DEV - tristate - depends on VIDEOBUF2_CORE - +# Used by drivers that need Videobuf2 modules config VIDEOBUF2_CORE tristate diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile index c0e90bc23692..c2d61d4f03d1 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -11,7 +11,7 @@ ifeq ($(CONFIG_COMPAT),y) endif obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o -obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o +obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o |