Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index eec7ccf..ae88243 100644 (file)
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -1,9 +1,14 @@
+config TTPCI_EEPROM
+       tristate
+       default n
+
 config DVB_AV7110
        tristate "AV7110 cards"
-       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+       depends on DVB_CORE && PCI && I2C
        select FW_LOADER if !DVB_AV7110_FIRMWARE
+       select TTPCI_EEPROM
        select VIDEO_SAA7146_VV
-       select DVB_PLL
+       depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
        select DVB_VES1820 if !DVB_FE_CUSTOMISE
        select DVB_VES1X93 if !DVB_FE_CUSTOMISE
        select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -58,25 +63,34 @@ config DVB_AV7110_OSD
 
          All other people say N.
 
+config DVB_BUDGET_CORE
+       tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
+       depends on DVB_CORE && PCI && I2C
+       select VIDEO_SAA7146
+       select TTPCI_EEPROM
+       help
+         Support for simple SAA7146 based DVB cards
+         (so called Budget- or Nova-PCI cards) without onboard
+         MPEG2 decoder.
+
 config DVB_BUDGET
        tristate "Budget cards"
-       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
-       select VIDEO_SAA7146
-       select DVB_PLL
+       depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0299 if !DVB_FE_CUSTOMISE
        select DVB_VES1X93 if !DVB_FE_CUSTOMISE
        select DVB_VES1820 if !DVB_FE_CUSTOMISE
        select DVB_L64781 if !DVB_FE_CUSTOMISE
        select DVB_TDA8083 if !DVB_FE_CUSTOMISE
        select DVB_TDA10021 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select DVB_S5H1420 if !DVB_FE_CUSTOMISE
        select DVB_TDA10086 if !DVB_FE_CUSTOMISE
        select DVB_TDA826X if !DVB_FE_CUSTOMISE
        select DVB_LNBP21 if !DVB_FE_CUSTOMISE
        help
-         Support for simple SAA7146 based DVB cards
-         (so called Budget- or Nova-PCI cards) without onboard
-         MPEG2 decoder.
+         Support for simple SAA7146 based DVB cards (so called Budget-
+         or Nova-PCI cards) without onboard MPEG2 decoder, and without
+         analog inputs or an onboard Common Interface connector.
 
          Say Y if you own such a card and want to use it.
 
@@ -85,9 +99,7 @@ config DVB_BUDGET
 
 config DVB_BUDGET_CI
        tristate "Budget cards with onboard CI connector"
-       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
-       select VIDEO_SAA7146
-       select DVB_PLL
+       depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0297 if !DVB_FE_CUSTOMISE
        select DVB_STV0299 if !DVB_FE_CUSTOMISE
        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
@@ -108,12 +120,14 @@ config DVB_BUDGET_CI
 
 config DVB_BUDGET_AV
        tristate "Budget cards with analog video inputs"
-       depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+       depends on DVB_BUDGET_CORE && I2C
        select VIDEO_SAA7146_VV
-       select DVB_PLL
+       depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
+       select DVB_PLL if !DVB_FE_CUSTOMISE
        select DVB_STV0299 if !DVB_FE_CUSTOMISE
        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
        select DVB_TDA10021 if !DVB_FE_CUSTOMISE
+       select DVB_TDA10023 if !DVB_FE_CUSTOMISE
        select DVB_TUA6100 if !DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -128,9 +142,8 @@ config DVB_BUDGET_AV
 
 config DVB_BUDGET_PATCH
        tristate "AV7110 cards with Budget Patch"
-       depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
-       select DVB_AV7110
-       select DVB_PLL
+       depends on DVB_BUDGET_CORE && I2C
+       depends on DVB_AV7110
        select DVB_STV0299 if !DVB_FE_CUSTOMISE
        select DVB_VES1X93 if !DVB_FE_CUSTOMISE
        select DVB_TDA8083 if !DVB_FE_CUSTOMISE