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

1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
index 3598dc087b08..d27fccbf03c4 100644
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@@ -6,7 +6,7 @@ config VIDEO_CX88
         select VIDEOBUF_DMA_SG
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
-        select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_WM8775 if MEDIA_SUBDRV_AUTOSELECT
         ---help---
           This is a video4linux driver for Conexant 2388x based
           TV cards.
@@ -46,23 +46,23 @@ config VIDEO_CX88_DVB
         tristate "DVB/ATSC Support for cx2388x based TV cards"
         depends on VIDEO_CX88 && DVB_CORE
         select VIDEOBUF_DVB
-        select DVB_PLL if !DVB_FE_CUSTOMISE
-        select DVB_MT352 if !DVB_FE_CUSTOMISE
-        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select DVB_OR51132 if !DVB_FE_CUSTOMISE
-        select DVB_CX22702 if !DVB_FE_CUSTOMISE
-        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-        select DVB_NXT200X if !DVB_FE_CUSTOMISE
-        select DVB_CX24123 if !DVB_FE_CUSTOMISE
-        select DVB_ISL6421 if !DVB_FE_CUSTOMISE
-        select DVB_S5H1411 if !DVB_FE_CUSTOMISE
-        select DVB_CX24116 if !DVB_FE_CUSTOMISE
-        select DVB_STV0299 if !DVB_FE_CUSTOMISE
-        select DVB_STV0288 if !DVB_FE_CUSTOMISE
-        select DVB_STB6000 if !DVB_FE_CUSTOMISE
-        select DVB_STV0900 if !DVB_FE_CUSTOMISE
-        select DVB_STB6100 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+        select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_OR51132 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CX22702 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_LGDT330X if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_NXT200X if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CX24123 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.