diff --git a/[refs] b/[refs]
index b9a44a3fb3fc..a0fa22a85eb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b38b0f88d28bd1b492fe225b6d401b2e51fd8cc
+refs/heads/master: d65fcbb0007bd8f0bcb93d1acd7970eea2aa06fc
diff --git a/trunk/drivers/media/dvb-frontends/Kconfig b/trunk/drivers/media/dvb-frontends/Kconfig
index 6f809a70c78e..0e2ec6f73b05 100644
--- a/trunk/drivers/media/dvb-frontends/Kconfig
+++ b/trunk/drivers/media/dvb-frontends/Kconfig
@@ -210,7 +210,7 @@ config DVB_SI21XX
 config DVB_TS2020
 	tristate "Montage Tehnology TS2020 based tuners"
 	depends on DVB_CORE && I2C
-	default m if DVB_FE_CUSTOMISE
+	default m if !MEDIA_SUBDRV_AUTOSELECT
 	help
 	  A DVB-S/S2 silicon tuner. Say Y when you want to support this tuner.