This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index edb9c73..a5ff5ec 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -4,12 +4,6 @@ config DVB_AV7110
        select FW_LOADER
        select VIDEO_DEV
        select VIDEO_SAA7146_VV
-       select DVB_VES1820
-       select DVB_VES1X93
-       select DVB_STV0299
-       select DVB_TDA8083
-       select DVB_SP8870
-       select DVB_STV0297
        help
          Support for SAA7146 and AV7110 based DVB cards as produced 
          by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -17,16 +11,11 @@ config DVB_AV7110
          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.
-
          Say Y if you own such a card and want to use it.
 
 config DVB_AV7110_FIRMWARE
        bool "Compile AV7110 firmware into the driver"
        depends on DVB_AV7110 && !STANDALONE
-       default y if DVB_AV7110=y
        help
          The AV7110 firmware is normally loaded by the firmware hotplug manager.
          If you want to compile the firmware into the driver you need to say
@@ -44,7 +33,6 @@ config DVB_AV7110_FIRMWARE_FILE
 config DVB_AV7110_OSD
        bool "AV7110 OSD support"
        depends on DVB_AV7110
-       default y if DVB_AV7110=y || DVB_AV7110=m
        help
          The AV7110 firmware provides some code to generate an OnScreenDisplay
          on the video output. This is kind of nonstandard and not guaranteed to
@@ -59,12 +47,6 @@ config DVB_BUDGET
        tristate "Budget cards"
        depends on DVB_CORE && PCI
        select VIDEO_SAA7146
-       select DVB_STV0299
-       select DVB_VES1X93
-       select DVB_VES1820
-       select DVB_L64781
-       select DVB_TDA8083
-       select DVB_TDA10021
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -79,8 +61,6 @@ config DVB_BUDGET_CI
        tristate "Budget cards with onboard CI connector"
        depends on DVB_CORE && PCI
        select VIDEO_SAA7146
-       select DVB_STV0299
-       select DVB_TDA1004X
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -99,7 +79,6 @@ config DVB_BUDGET_AV
        depends on DVB_CORE && PCI
        select VIDEO_DEV
        select VIDEO_SAA7146_VV
-       select DVB_STV0299
        help
          Support for simple SAA7146 based DVB cards
          (so called Budget- or Nova-PCI cards) without onboard
@@ -112,11 +91,8 @@ config DVB_BUDGET_AV
 
 config DVB_BUDGET_PATCH
        tristate "AV7110 cards with Budget Patch"
-       depends on DVB_CORE && DVB_BUDGET
+       depends on DVB_BUDGET
        select DVB_AV7110
-       select DVB_STV0299
-       select DVB_VES1X93
-       select DVB_TDA8083
        help
          Support for Budget Patch (full TS) modification on 
          SAA7146+AV7110 based cards (DVB-S cards). This