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 / ttpci / Kconfig

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 7ffa2c7..b5ac7df 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -1,8 +1,7 @@
 config DVB_AV7110
        tristate "AV7110 cards"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
        select FW_LOADER
-       select VIDEO_DEV
        select VIDEO_SAA7146_VV
        select DVB_VES1820
        select DVB_VES1X93
@@ -12,15 +11,16 @@ config DVB_AV7110
        select DVB_STV0297
        select DVB_L64781
        help
-         Support for SAA7146 and AV7110 based DVB cards as produced 
+         Support for SAA7146 and AV7110 based DVB cards as produced
          by Fujitsu-Siemens, Technotrend, Hauppauge and others.
 
          This driver only supports the fullfeatured cards with
          onboard MPEG2 decoder.
 
-          This driver needs an external firmware. Please use the script
-          "<kerneldir>/Documentation/dvb/get_dvb_firmware av7110" to
-          download/extract it, and then copy it to /usr/lib/hotplug/firmware.
+         This driver needs an external firmware. Please use the script
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware av7110" to
+         download/extract it, and then copy it to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
 
          Say Y if you own such a card and want to use it.
 
@@ -33,7 +33,7 @@ config DVB_AV7110_FIRMWARE
          If you want to compile the firmware into the driver you need to say
          Y here and provide the correct path of the firmware. You need this
          option if you want to compile the whole driver statically into the
-         kernel. 
+         kernel.
 
          All other people say N.
 
@@ -58,7 +58,7 @@ config DVB_AV7110_OSD
 
 config DVB_BUDGET
        tristate "Budget cards"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
        select VIDEO_SAA7146
        select DVB_STV0299
        select DVB_VES1X93
@@ -66,6 +66,7 @@ config DVB_BUDGET
        select DVB_L64781
        select DVB_TDA8083
        select DVB_TDA10021
+       select DVB_S5H1420
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -78,8 +79,9 @@ config DVB_BUDGET
 
 config DVB_BUDGET_CI
        tristate "Budget cards with onboard CI connector"
-       depends on DVB_CORE && PCI
+       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
        select VIDEO_SAA7146
+       select DVB_STV0297
        select DVB_STV0299
        select DVB_TDA1004X
        help
@@ -97,10 +99,12 @@ config DVB_BUDGET_CI
 
 config DVB_BUDGET_AV
        tristate "Budget cards with analog video inputs"
-       depends on DVB_CORE && PCI
-       select VIDEO_DEV
+       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
        select VIDEO_SAA7146_VV
        select DVB_STV0299
+       select DVB_TDA1004X
+       select DVB_TDA10021
+       select FW_LOADER
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -113,15 +117,15 @@ config DVB_BUDGET_AV
 
 config DVB_BUDGET_PATCH
        tristate "AV7110 cards with Budget Patch"
-       depends on DVB_CORE && DVB_BUDGET
+       depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
        select DVB_AV7110
        select DVB_STV0299
        select DVB_VES1X93
        select DVB_TDA8083
        help
-         Support for Budget Patch (full TS) modification on 
+         Support for Budget Patch (full TS) modification on
          SAA7146+AV7110 based cards (DVB-S cards). This
-         driver doesn't use onboard MPEG2 decoder. The 
+         driver doesn't use onboard MPEG2 decoder. The
          card is driven in Budget-only mode. Card is
          required to have loaded firmware to tune properly.
          Firmware can be loaded by insertion and removal of