diff --git a/[refs] b/[refs]
index 0f2a26a8591f..0b04e246e4a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b6bcb16c6b528fb5832244db949366bf0e42f44
+refs/heads/master: 523b78d1d202dedcd9e549576d6179d68210c038
diff --git a/trunk/drivers/media/dvb/Kconfig b/trunk/drivers/media/dvb/Kconfig
index 525c5184f9f7..efd2b7468158 100644
--- a/trunk/drivers/media/dvb/Kconfig
+++ b/trunk/drivers/media/dvb/Kconfig
@@ -4,6 +4,15 @@
 
 source "drivers/media/dvb/dvb-core/Kconfig"
 
+menuconfig DVB_CAPTURE_DRIVERS
+	bool "DVB/ATSC adapters"
+	depends on DVB_CORE
+	default y
+	---help---
+	  Say Y to select Digital TV adapters
+
+if DVB_CAPTURE_DRIVERS
+
 comment "Supported SAA7146 based PCI Adapters"
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/ttpci/Kconfig"
@@ -30,3 +39,5 @@ source "drivers/media/dvb/pluto2/Kconfig"
 comment "Supported DVB Frontends"
 	depends on DVB_CORE
 source "drivers/media/dvb/frontends/Kconfig"
+
+endif # DVB_CAPTURE_DRIVERS
diff --git a/trunk/drivers/media/dvb/dvb-core/Kconfig b/trunk/drivers/media/dvb/dvb-core/Kconfig
index 93e24fb0e68e..e3e6839f8073 100644
--- a/trunk/drivers/media/dvb/dvb-core/Kconfig
+++ b/trunk/drivers/media/dvb/dvb-core/Kconfig
@@ -1,4 +1,4 @@
-menuconfig DVB_CORE
+config DVB_CORE
 	tristate "DVB for Linux"
 	depends on NET && INET
 	select CRC32