1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig
index 928ef0d0429f..7a5bd61bd3bb 100644
--- a/drivers/media/usb/em28xx/Kconfig
+++ b/drivers/media/usb/em28xx/Kconfig
@@ -4,10 +4,10 @@ config VIDEO_EM28XX
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEOBUF_VMALLOC
-        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_MT9V011 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
+        select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT
+        select VIDEO_MSP3400 if MEDIA_SUBDRV_AUTOSELECT
+        select VIDEO_MT9V011 if MEDIA_SUBDRV_AUTOSELECT
 
         ---help---
           This is a video4linux driver for Empia 28xx based TV cards.
@@ -33,16 +33,16 @@ config VIDEO_EM28XX_ALSA
 config VIDEO_EM28XX_DVB
         tristate "DVB/ATSC Support for em28xx based TV cards"
         depends on VIDEO_EM28XX && DVB_CORE
-        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select DVB_TDA10023 if !DVB_FE_CUSTOMISE
-        select DVB_S921 if !DVB_FE_CUSTOMISE
-        select DVB_DRXD if !DVB_FE_CUSTOMISE
-        select DVB_CXD2820R if !DVB_FE_CUSTOMISE
-        select DVB_DRXK if !DVB_FE_CUSTOMISE
-        select DVB_TDA18271C2DD if !DVB_FE_CUSTOMISE
-        select DVB_TDA10071 if !DVB_FE_CUSTOMISE
-        select DVB_A8293 if !DVB_FE_CUSTOMISE
+        select DVB_LGDT330X if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TDA10023 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_S921 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_DRXD if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CXD2820R if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_DRXK if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TDA18271C2DD if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TDA10071 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_A8293 if MEDIA_SUBDRV_AUTOSELECT
         select VIDEOBUF_DVB
         ---help---
           This adds support for DVB cards based on the