summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-08-20 14:48:02 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-21 08:05:06 -0300
commitfccea74ff8b5159935acc7b4b4857ee81ee44661 (patch)
treee5d67c5a7993c5d71478f4cb833f7631113f1333 /drivers/media/i2c
parentfc2bbfb2c3d77c0b6da76224ef1575f0e90327e8 (diff)
downloadblackbird-op-linux-fccea74ff8b5159935acc7b4b4857ee81ee44661.tar.gz
blackbird-op-linux-fccea74ff8b5159935acc7b4b4857ee81ee44661.zip
[media] Kconfig: merge all customise options into just one
Instead of having 3 options to allow customizing the media sub-drivers (tuners, I2C drivers, frontends), merge all of them into just one. That simplifies the life for users, as they can just keep this untouched. Life for developers is also simpler, as there's now just one Kconfig item to remember, for the ancillary sub-drivers providing supports for chips that could change from one board design to another. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/Kconfig21
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 527430ac06f3..d41dc0aa005e 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -16,21 +16,8 @@ config VIDEO_TVEEPROM
if VIDEO_V4L2
-config VIDEO_HELPER_CHIPS_AUTO
- bool "Autoselect pertinent encoders/decoders and other helper chips"
- default y if !EXPERT
- ---help---
- Most video cards may require additional modules to encode or
- decode audio/video standards. This option will autoselect
- all pertinent modules to each selected video module.
-
- Unselect this only if you know exactly what you are doing, since
- it may break support on some boards.
-
- In doubt, say Y.
-
config VIDEO_IR_I2C
- tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
+ tristate "I2C module for IR" if !MEDIA_SUBDRV_AUTOSELECT
depends on I2C && RC_CORE
default y
---help---
@@ -47,7 +34,7 @@ config VIDEO_IR_I2C
#
menu "Encoders, decoders, sensors and other helper chips"
- visible if !VIDEO_HELPER_CHIPS_AUTO
+ visible if !MEDIA_SUBDRV_AUTOSELECT
comment "Audio decoders, processors and mixers"
@@ -561,10 +548,14 @@ config VIDEO_M52790
To compile this driver as a module, choose M here: the
module will be called m52790.
+endmenu
+
+menu "Sensors used on soc_camera driver"
if SOC_CAMERA
source "drivers/media/i2c/soc_camera/Kconfig"
endif
endmenu
+
endif
OpenPOWER on IntegriCloud