Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / dvb / Kconfig

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 525c518..8bc1445 100644 (file)
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -1,8 +1,15 @@
 #
-# Multimedia device configuration
+# DVB device configuration
 #
 
-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 && DVB_CORE
 
 comment "Supported SAA7146 based PCI Adapters"
        depends on DVB_CORE && PCI && I2C
@@ -14,6 +21,7 @@ source "drivers/media/dvb/dvb-usb/Kconfig"
 source "drivers/media/dvb/ttusb-budget/Kconfig"
 source "drivers/media/dvb/ttusb-dec/Kconfig"
 source "drivers/media/dvb/cinergyT2/Kconfig"
+source "drivers/media/dvb/siano/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
        depends on DVB_CORE && (PCI || USB) && I2C
@@ -30,3 +38,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