Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / media / dvb / Kconfig

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index f0f1520..a97c8f5 100644 (file)
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -8,46 +8,44 @@ config DVB
        bool "DVB For Linux"
        depends on NET && INET
        ---help---
-         Support Digital Video Broadcasting hardware.  Enable this if you 
-         own a DVB adapter and want to use it or if you compile Linux for 
+         Support Digital Video Broadcasting hardware.  Enable this if you
+         own a DVB adapter and want to use it or if you compile Linux for
          a digital SetTopBox.
 
-         API specs and user tools are available from
-         <http://www.linuxtv.org/>. 
+         API specs and user tools are available from <http://www.linuxtv.org/>.
 
-         Please report problems regarding this driver to the LinuxDVB 
+         Please report problems regarding this driver to the LinuxDVB
          mailing list.
 
-         You might want add the following lines to your /etc/modules.conf:
-               
-               alias char-major-250 dvb
-               alias dvb dvb-ttpci
-               below dvb-ttpci alps_bsru6 alps_bsrv2 \
-                               grundig_29504-401 grundig_29504-491 \
-                               ves1820
-
          If unsure say N.
 
 source "drivers/media/dvb/dvb-core/Kconfig"
 
-source "drivers/media/dvb/frontends/Kconfig"
-
 comment "Supported SAA7146 based PCI Adapters"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/ttpci/Kconfig"
 
 comment "Supported USB Adapters"
-       depends on DVB_CORE && USB
+       depends on DVB_CORE && USB && I2C
+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"
 
 comment "Supported FlexCopII (B2C2) Adapters"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && (PCI || USB) && I2C
 source "drivers/media/dvb/b2c2/Kconfig"
 
 comment "Supported BT878 Adapters"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/bt8xx/Kconfig"
 
-endmenu
+comment "Supported Pluto2 Adapters"
+       depends on DVB_CORE && PCI && I2C
+source "drivers/media/dvb/pluto2/Kconfig"
 
+comment "Supported DVB Frontends"
+       depends on DVB_CORE
+source "drivers/media/dvb/frontends/Kconfig"
+
+endmenu