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

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 5955a276f468..d4c034d2bd8d 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -66,7 +66,7 @@ config VIDEO_TIMBERDALE
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux"
         depends on I2C && SGI_IP22 && VIDEO_V4L2
-        select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA7191 if MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to build in support for the Vino video input system found
           on SGI Indy machines.
diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index 52c5ca68cb3d..78e26d24f637 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -3,8 +3,8 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
         depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM)
         select VIDEOBUF2_DMA_CONTIG
         select VIDEO_DAVINCI_VPIF
-        select VIDEO_ADV7343 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_THS7303 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT
+        select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT
         help
           Enables Davinci VPIF module used for display devices.
           This module is common for following DM6467/DA850/OMAPL138