diff --git a/config-generic b/config-generic
index c98215661..9cf9e2b51 100644
--- a/config-generic
+++ b/config-generic
@@ -2555,26 +2555,12 @@ CONFIG_RADIO_WL1273=m
 # CONFIG_RADIO_WL128X is not set # depends on TI_ST which we don't enable
 
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
+
+#
+# V4L/DVB tuners
+# Selected automatically by not setting CONFIG_MEDIA_TUNER_CUSTOMISE
+#
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 
 #
 # Digital Video Broadcasting Devices
@@ -2585,75 +2571,14 @@ CONFIG_DVB_NET=y
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 
-CONFIG_DVB_FE_CUSTOMISE=y
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_CXD2820R=m
+#
+# DVB frontends
+# Selected automatically by not setting CONFIG_DVB_FE_CUSTOMISE
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
 
 #
-# Supported Frontend Modules
+# Supported DVB bridge Modules
 #
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
@@ -2671,30 +2596,12 @@ CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_DM1105=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_DUMMY_FE=m
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_MB86A20S=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_HD29L2=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_M88RS2000=m
 
-
-#
-# Supported SAA7146 based PCI Adapters
-#
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
@@ -2702,14 +2609,8 @@ CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_PATCH=m
 
-#
-# Supported USB Adapters
-#
 CONFIG_DVB_TTUSB_BUDGET=m
 
-#
-# Supported FlexCopII (B2C2) Adapters
-#
 CONFIG_DVB_USB_CINERGY_T2=m
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m