diff --git a/[refs] b/[refs]
index 2e8eb364d083..b2e0cd3f093c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f91294d37a1824c4487b041dc1b4aefbef5fc76e
+refs/heads/master: 1f5b5cf600ba860ba684e349e63d46438ba05cdf
diff --git a/trunk/drivers/media/dvb/dvb-usb/Kconfig b/trunk/drivers/media/dvb/dvb-usb/Kconfig
index 3763a9c68925..64fa1d182347 100644
--- a/trunk/drivers/media/dvb/dvb-usb/Kconfig
+++ b/trunk/drivers/media/dvb/dvb-usb/Kconfig
@@ -69,11 +69,11 @@ config DVB_USB_DIBUSB_MC
 config DVB_USB_DIB0700
 	tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
 	depends on DVB_USB
-	select DVB_DIB7000P
-	select DVB_DIB7000M
-	select DVB_DIB3000MC
+	select DVB_DIB7000P if !DVB_FE_CUSTOMISE
+	select DVB_DIB7000M if !DVB_FE_CUSTOMISE
+	select DVB_DIB3000MC if !DVB_FE_CUSTOMISE
 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE
-	select DVB_TUNER_DIB0070
+	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
 	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
 	select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE
 	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE