Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] Cleanup media Kconfig files

Browse Source 
- 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>
This commit is contained in:
Mauro Carvalho Chehab 2012-08-20 10:32:19 -03:00
parent 7a46e188bf
commit b6334460f2
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/Kconfig
View File

@ -99,11 +99,6 @@ config VIDEO_DEV
depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT
default y
config VIDEO_V4L2_COMMON
tristate
depends on (I2C || I2C=n) && VIDEO_DEV
default (I2C || I2C=n) && VIDEO_DEV
config VIDEO_V4L2_SUBDEV_API
bool "V4L2 sub-device userspace API (EXPERIMENTAL)"
depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL

2
drivers/media/i2c/Kconfig
View File

@ -322,7 +322,7 @@ comment "MPEG video encoders"
config VIDEO_CX2341X
tristate "Conexant CX2341x MPEG encoders"
depends on VIDEO_V4L2 && VIDEO_V4L2_COMMON
depends on VIDEO_V4L2
---help---
Support for the Conexant CX23416 MPEG encoders
and CX23415 MPEG encoder/decoders.

6
drivers/media/platform/Kconfig
View File

@ -1,5 +1,3 @@
if MEDIA_CAMERA_SUPPORT
#
# Platform drivers
# All drivers here are currently for webcam support
@ -37,6 +35,7 @@ source "drivers/media/platform/blackfin/Kconfig"
config VIDEO_SH_VOU
tristate "SuperH VOU video output driver"
depends on MEDIA_CAMERA_SUPPORT
depends on VIDEO_DEV && ARCH_SHMOBILE
select VIDEOBUF_DMA_CONTIG
help
@ -119,6 +118,7 @@ endif # V4L_PLATFORM_DRIVERS
menuconfig V4L_MEM2MEM_DRIVERS
bool "Memory-to-memory multimedia devices"
depends on VIDEO_V4L2
depends on MEDIA_CAMERA_SUPPORT
default n
---help---
Say Y here to enable selecting drivers for V4L devices that
@ -212,5 +212,3 @@ config VIDEO_MEM2MEM_TESTDEV
This is a virtual test device for the memory-to-memory driver
framework.
endif #V4L_TEST_DRIVERS
endif # MEDIA_CAMERA_SUPPORT

27
drivers/media/v4l2-core/Kconfig
View File

@ -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

2
drivers/media/v4l2-core/Makefile
View File

@ -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